diff makefile.mingw @ 1663:a76fb5f1a6c8

Fixes for building in Unicode mode with MinGW on Windows. Also fix incorrect calling conventions on signal handlers with MinGW. AEROGLASS is still not supported with MinGW due to some missing items in the uxtheme.h header.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 20 Apr 2012 19:44:16 +0000
parents 6baf177f335c
children 22225eb286e5
line wrap: on
line diff
--- a/makefile.mingw	Wed Apr 18 07:28:19 2012 +0000
+++ b/makefile.mingw	Fri Apr 20 19:44:16 2012 +0000
@@ -9,7 +9,7 @@
 DEFS =
 LIBS =
 
-CFLAGS = -O -g -DMSVC -DWIN32 -D__WIN32__ -DGDIPLUS -DISOLATION_AWARE_ENABLED=1 -DBUILD_DLL -I./win -I. -I./platform -Wall -mthreads -o $(@)
+CFLAGS = -O -g -DMSVC -DWIN32 -D__WIN32__ -DGDIPLUS -DUNICODE -D_UNICODE -DISOLATION_AWARE_ENABLED=1 -I./win -I. -I./platform -Wall -mthreads -o $(@)
 LDFLAGS = -shared -mwindows -mthreads -lcomctl32 -lole32 -loleaut32 -luserenv -lmsimg32 -lgdiplus
 
 COMPATOBJECTS = dwcompat.o dirent.o
@@ -31,16 +31,16 @@
 	$(CC) $(CFLAGS) -o dwtest.exe dwtest.o dw.a dwcompat.a
 
 dw.o: win/dw.c
-	$(CC) $(CFLAGS) -c $<	
+	$(CC) $(CFLAGS) -DBUILD_DLL -c $<	
 
 XBrowseForFolder.o: win/XBrowseForFolder.cpp
-	$(CC) $(CFLAGS) -c $<	
+	$(CC) $(CFLAGS) -DBUILD_DLL -c $<	
 
 dwcompat.o: dwcompat.c
-	$(CC) $(CFLAGS) -c $<	
+	$(CC) $(CFLAGS) -DBUILD_DLL -c $<	
 
 dirent.o: win/dirent.c
-	$(CC) $(CFLAGS) -c $<	
+	$(CC) $(CFLAGS) -DBUILD_DLL -c $<	
 
 dwtest.o: dwtest.c
 	$(CC) $(CFLAGS) -c $<