Mercurial > dwindows

comparison makefile.vc @ 647:f09977bc9b5c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed building with Visual Studio 2008. Fixed a conflict with a C library function _free_locale and switched back to linking with the static library.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Sat, 19 Feb 2011 00:00:19 +0000
parents 9ab89d89e6b4
children e6a9f1c7b0d7
comparison
equal deleted inserted replaced
646:5ea195fd28da 647:f09977bc9b5c
13 FXLIBDIR=.\lib 13 FXLIBDIR=.\lib
14 FXDLLDIR=.\dll 14 FXDLLDIR=.\dll
15 15
16 !if "$(DEBUG)" == "Y" 16 !if "$(DEBUG)" == "Y"
17 CFLAGS_DEBUG = -DDEBUG -Z7 -Od # was -Zi 17 CFLAGS_DEBUG = -DDEBUG -Z7 -Od # was -Zi
18 LINK_DEBUG = -debug:full 18 LINK_DEBUG = -debug
19 !else 19 !else
20 CFLAGS_DEBUG = -Ox 20 CFLAGS_DEBUG = -Ox
21 LINK_DEBUG = -release 21 LINK_DEBUG = -release
22 !endif 22 !endif
23 23
24 CC = cl 24 CC = cl
25 CFLAGS = -c -G5 -GD -Zp1 -DWIN32 -D__WIN32__ -DMSVC -DBUILD_DLL -I$(SRCDIR)\platform -I$(SRCDIR) 25 CFLAGS = -c -Zp1 -DWIN32 -D__WIN32__ -DMSVC -DBUILD_DLL -I$(SRCDIR)\platform -I$(SRCDIR)
26 #CFLAGS_COMPILE = -MTd 26 CFLAGS_COMPILE = -MTd # was -MD
27 CFLAGS_COMPILE = -MD
28 LIBS = wsock32.lib kernel32.lib user32.lib comctl32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib ole32.lib oleaut32.lib 27 LIBS = wsock32.lib kernel32.lib user32.lib comctl32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib ole32.lib oleaut32.lib
29 RES = 28 RES =
30 LINKFLAGS = -machine:i386 $(LINK_DEBUG) 29 LINKFLAGS = -machine:i386 $(LINK_DEBUG)
31 DLLLINKFLAGS = -dll 30 DLLLINKFLAGS = -dll
32 LINK = link 31 LINK = link