Update of /cvsroot/monetdb/MonetDB/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv923
Modified Files:
winrules.msc
Log Message:
Make it easier possible to compile against debugging libraries (which you will
need to create first...).
Pass DEBUG=1/NDEBUG=1 command line option to inferior nmake.
Index: winrules.msc
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/NT/winrules.msc,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- winrules.msc 19 Dec 2007 06:00:16 -0000 1.17
+++ winrules.msc 7 Jan 2008 15:17:14 -0000 1.18
@@ -36,6 +36,12 @@
!ENDIF
!ENDIF
+!IFDEF DEBUG
+DEBUGLIB=d
+!ELSE
+DEBUGLIB=
+!ENDIF
+
# This is the location of pthreads for Win32,
# see http://sources.redhat.com/pthreads-win32/
PTHREAD = C:\Pthreads
@@ -65,7 +71,7 @@
# !IFDEF HAVE_ICONV
# This is the location of the ICONV library
LIBICONV = C:\iconv-1.9.2.win$(bits)
-ICONV_LIBS = "$(LIBICONV)\lib\iconv.lib"
+ICONV_LIBS = "$(LIBICONV)\lib\iconv$(DEBUGLIB).lib"
ICONV_CFLAGS = -DHAVE_ICONV "-I$(LIBICONV)\include"
# !ENDIF
@@ -73,9 +79,9 @@
# This is the location of the Z library
LIBZLIB = C:\zlib-1.2.3.win$(bits)
!IF $(bits) == 32
-Z_LIBS = "$(LIBZLIB)\lib\zdll.lib"
+Z_LIBS = "$(LIBZLIB)\lib\zdll$(DEBUGLIB).lib"
!ELSE
-Z_LIBS = "$(LIBZLIB)\lib\zlib1.lib"
+Z_LIBS = "$(LIBZLIB)\lib\zlib1$(DEBUGLIB).lib"
!ENDIF
Z_CFLAGS = -DHAVE_LIBZ "-I$(LIBZLIB)\include"
# !ENDIF
@@ -85,9 +91,9 @@
LIBXML2 = C:\libxml2-2.6.30.win$(bits)
LIBXML2_CFLAGS = -DHAVE_LIBXML2 "-I$(LIBXML2)\include" "-I$(LIBZLIB)\include"
"-I$(LIBICONV)\include"
!IF $(bits) == 32
-LIBXML2_LIBS = "$(LIBXML2)\lib\libxml2.lib" "$(LIBZLIB)\lib\zdll.lib"
"$(LIBICONV)\lib\iconv.lib"
+LIBXML2_LIBS = "$(LIBXML2)\lib\libxml2$(DEBUGLIB).lib"
"$(LIBZLIB)\lib\zdll$(DEBUGLIB).lib" "$(LIBICONV)\lib\iconv$(DEBUGLIB).lib"
!ELSE
-LIBXML2_LIBS = "$(LIBXML2)\lib\libxml2.lib" "$(LIBZLIB)\lib\zlib1.lib"
"$(LIBICONV)\lib\iconv.lib"
+LIBXML2_LIBS = "$(LIBXML2)\lib\libxml2$(DEBUGLIB).lib"
"$(LIBZLIB)\lib\zlib1$(DEBUGLIB).lib" "$(LIBICONV)\lib\iconv$(DEBUGLIB).lib"
!ENDIF
# !ENDIF
@@ -219,12 +225,15 @@
!IFNDEF DEBUG
!IFDEF NDEBUG
CFLAGS = $(CFLAGS) -DNDEBUG
+MAKEDEBUG=NDEBUG=1
!ELSE
# default in case neither NDEBUG nor DEBUG are defined
CFLAGS = $(CFLAGS)
+MAKEDEBUG=
!ENDIF
!ELSE
CFLAGS = $(CFLAGS) -Wp64 -Wcheck
+MAKEDEBUG=DEBUG=1
!ENDIF
# When compiled with plain `nmake`,
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
