Mercurial > dwindows
diff makefile.mingw @ 1865:43c6ecfc598a
It seems WIN64 is defined in 32-bit mode using MinGW... so switch
to using DW64 as the define to say which mode we are compiling in.
This fixes 32-bit MinGW builds not functioning due to using 64-bit
manifest instead of the 32-bit one.
| author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
|---|---|
| date | Fri, 08 Mar 2013 18:03:13 +0000 |
| parents | 417176df4755 |
| children | 87d574dda8f5 |
line wrap: on
line diff
--- a/makefile.mingw Thu Mar 07 20:17:24 2013 +0000 +++ b/makefile.mingw Fri Mar 08 18:03:13 2013 +0000 @@ -18,7 +18,7 @@ else PLATFORM_DEF=-DWIN64 PLATFORM_CFLAGS=-m64 -PLATFORM_TARGET=pe-x86-64 +PLATFORM_TARGET=pe-x86-64 -DDW64 endif # Had to disable -Wunused-value due to every Win32 macro generating this warning... @@ -34,7 +34,7 @@ all: dw.dll dwcompat.dll dwtest.exe dw.res: win/dw.rc - windres $(PLATFORM_DEF) --target=$(PLATFORM_TARGET) --input win/dw.rc --output dw.res --output-format=coff + windres --target=$(PLATFORM_TARGET) --input win/dw.rc --output dw.res --output-format=coff dw.dll: $(OBJECTS) win/dw-mingw.def dw.res $(CC) $(CFLAGS) $(DEFS) -o dw.dll dw.res $(OBJECTS) $(LDFLAGS) \ @@ -45,7 +45,7 @@ -Wl,--out-implib,dwcompat.a -Wl,-Map,dwcompat.dll.map -Wl,--cref -Wl,--enable-stdcall-fixup win/dwcompat-mingw.def dwtest.res: win/dwtest.rc - windres $(PLATFORM_DEF) --target=$(PLATFORM_TARGET) --input win/dwtest.rc --output dwtest.res --output-format=coff + windres --target=$(PLATFORM_TARGET) --input win/dwtest.rc --output dwtest.res --output-format=coff dwtest.exe: dwtest.o dw.a dwcompat.a dwtest.res $(CC) $(CFLAGS) -o dwtest.exe dwtest.res dwtest.o dw.a dwcompat.a