diff makefile.vc @ 647:f09977bc9b5c

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
line wrap: on
line diff
--- a/makefile.vc	Fri Feb 18 13:30:43 2011 +0000
+++ b/makefile.vc	Sat Feb 19 00:00:19 2011 +0000
@@ -15,16 +15,15 @@
 
 !if "$(DEBUG)" == "Y"
 CFLAGS_DEBUG = -DDEBUG -Z7 -Od # was -Zi
-LINK_DEBUG = -debug:full
+LINK_DEBUG = -debug
 !else
 CFLAGS_DEBUG = -Ox
 LINK_DEBUG = -release
 !endif
 
 CC = cl
-CFLAGS = -c -G5 -GD -Zp1 -DWIN32 -D__WIN32__ -DMSVC -DBUILD_DLL -I$(SRCDIR)\platform -I$(SRCDIR)
-#CFLAGS_COMPILE = -MTd
-CFLAGS_COMPILE = -MD
+CFLAGS = -c -Zp1 -DWIN32 -D__WIN32__ -DMSVC -DBUILD_DLL -I$(SRCDIR)\platform -I$(SRCDIR)
+CFLAGS_COMPILE = -MTd # was -MD
 LIBS = wsock32.lib kernel32.lib user32.lib comctl32.lib gdi32.lib advapi32.lib shell32.lib comdlg32.lib ole32.lib oleaut32.lib
 RES =
 LINKFLAGS = -machine:i386 $(LINK_DEBUG)