diff options
| author | unknown <[email protected]> | 2011-02-22 17:29:46 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2011-12-02 15:21:10 +0100 |
| commit | 7b3596ba1521f201c9416fc7a0385cb7e6c6f495 (patch) | |
| tree | d3c0f1152ec3ee094e3fb142c091d89786b5ac46 /erts/emulator/Makefile.in | |
| parent | def5331a201ab811150599b969abf751a4954ceb (diff) | |
| download | otp-7b3596ba1521f201c9416fc7a0385cb7e6c6f495.tar.gz otp-7b3596ba1521f201c9416fc7a0385cb7e6c6f495.tar.bz2 otp-7b3596ba1521f201c9416fc7a0385cb7e6c6f495.zip | |
Build Win64 Erlang emulator using MSYS
Still does not run, just compiles.
Diffstat (limited to 'erts/emulator/Makefile.in')
| -rw-r--r-- | erts/emulator/Makefile.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/erts/emulator/Makefile.in b/erts/emulator/Makefile.in index 289d5e2a9d..a5d8217545 100644 --- a/erts/emulator/Makefile.in +++ b/erts/emulator/Makefile.in @@ -198,6 +198,7 @@ RM = @RM@ MKDIR = @MKDIR@ USING_MINGW=@MIXED_CYGWIN_MINGW@ +MIXED_MSYS=@MIXED_MSYS@ ifeq ($(TARGET),win32) LIB_PREFIX= @@ -237,9 +238,12 @@ ifeq ($(TARGET), win32) GEN_OPT_FLGS = $(OPT_LEVEL) UNROLL_FLG = RC=rc.sh +ifeq ($(MIXED_MSYS), yes) +MAKE_PRELOAD_EXTRA = -msys +endif ifeq ($(USING_MINGW), yes) -RES_EXT=@OBJEXT@ -MAKE_PRELOAD_EXTRA=-windres +RES_EXT = @OBJEXT@ +MAKE_PRELOAD_EXTRA += " -windres" else RES_EXT=res endif |