Update of /cvsroot/monetdb/pathfinder/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1110/NT
Modified Files:
Makefile rules.msc
Log Message:
Made separate configuration for Win64.
Index: rules.msc
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/NT/rules.msc,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- rules.msc 1 Nov 2007 14:35:11 -0000 1.24
+++ rules.msc 23 Nov 2007 13:47:50 -0000 1.25
@@ -31,11 +31,15 @@
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.win32
-LIBICONV = C:\iconv-1.9.2.win32
-LIBZLIB = C:\zlib-1.2.3.win32
+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)
Index: Makefile
===================================================================
RCS file: /cvsroot/monetdb/pathfinder/NT/Makefile,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- Makefile 15 Oct 2007 15:39:13 -0000 1.15
+++ Makefile 23 Nov 2007 13:47:50 -0000 1.16
@@ -12,19 +12,28 @@
UNISTD_H = unistd.h
all: "$(SRCDIR)\Makefile.msc" all-msc $(UNISTD_H) RunMserver.bat RunMtest.bat
RunMapprove.bat
- $(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)" all
+ $(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" all
check: "$(SRCDIR)\Makefile.msc" RunMtest.bat
- $(MAKE) /nologo /i /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)" check
+ $(MAKE) /nologo /i /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" check
call RunMtest.bat
-install: targetdirs pf_config.h all
+!IFDEF BITS32
+install-installer:
+ $(INSTALL) MonetDB4-XQuery\MonetDB4-XQuery-Installer.sln "$(prefix)"
+ $(INSTALL) MonetDB4-XQuery\MonetDB4-XQuery-Installer.vdproj "$(prefix)"
+!ENDIF
+!IFDEF BITS64
+install-installer:
+ $(INSTALL) MonetDB4-XQuery64\MonetDB4-XQuery-Installer.sln "$(prefix)"
+ $(INSTALL) MonetDB4-XQuery64\MonetDB4-XQuery-Installer.vdproj
"$(prefix)"
+!ENDIF
+
+install: targetdirs pf_config.h all install-installer
$(INSTALL) pf_config.h "$(includedir)"
- $(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)" install
+ $(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" install
if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) MXQserver.bat "$(prefix)"
if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) pf.bat "$(prefix)"
- $(INSTALL) MonetDB4-XQuery\MonetDB4-XQuery-Installer.sln "$(prefix)"
- $(INSTALL) MonetDB4-XQuery\MonetDB4-XQuery-Installer.vdproj "$(prefix)"
$(SRCDIR)\Makefile.msc: "$(SRCDIR)\Makefile.ag"
$(CD) "$(SRCDIR)" && autogen.py
-------------------------------------------------------------------------
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
