Update of /cvsroot/monetdb/pathfinder/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv28714
Modified Files:
rules.msc
Log Message:
Remove duplicate code (this code is also in MonetDB/NT/winrules.msc).
Index: rules.msc
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/NT/rules.msc,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- rules.msc 9 Dec 2007 13:03:52 -0000 1.27
+++ rules.msc 7 Jan 2008 13:44:53 -0000 1.28
@@ -30,17 +30,6 @@
# burg is part of the buildtools
BURG=burg.exe
-# This is the location of libxml2 and its dependencies (depends how it was
compiled; sometimes iconv and zlib are needed)
-LIBXML2 = C:\libxml2-2.6.30.win$(bits)
-LIBICONV = C:\iconv-1.9.2.win$(bits)
-LIBZLIB = C:\zlib-1.2.3.win$(bits)
-LIBXML2_CFLAGS = "-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"
-!ELSE
-LIBXML2_LIBS = "$(LIBXML2)\lib\libxml2.lib" "$(LIBZLIB)\lib\zlib1.lib"
"$(LIBICONV)\lib\iconv.lib"
-!ENDIF
-
# override value from global rules.msc
LIBC_INCS = $(PTHREAD_INCS) $(LIBXML_INCS)
-------------------------------------------------------------------------
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-pf-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-pf-checkins
