# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1298073619 0
# Node ID f09977bc9b5c1a83a9f17b07b63212798a7d7ff5
# Parent  5ea195fd28dac22e88d958e6fedfae0321012eea
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.

diff -r 5ea195fd28da -r f09977bc9b5c compat.c
--- a/compat.c	Fri Feb 18 13:30:43 2011 +0000
+++ b/compat.c	Sat Feb 19 00:00:19 2011 +0000
@@ -651,7 +651,7 @@
 static int locale_number = -1, locale_count = 0;
 static char **locale_text = NULL;
 
-void _free_locale(void)
+void _compat_free_locale(void)
 {
 	if(locale_text)
 	{
@@ -720,7 +720,7 @@
 	static char text[1025];
 	int count = 0;
 
-	_free_locale();
+	_compat_free_locale();
 
 	if(fp)
 	{
diff -r 5ea195fd28da -r f09977bc9b5c makefile.vc
--- 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)