Update of /cvsroot/monetdb/MonetDB/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv1056/NT
Modified Files:
Makefile winrules.msc
Log Message:
Made separate configuration for Win64.
Index: Makefile
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/NT/Makefile,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- Makefile 2 Aug 2007 13:53:03 -0000 1.47
+++ Makefile 23 Nov 2007 13:47:27 -0000 1.48
@@ -12,17 +12,17 @@
UNISTD_H = unistd.h
all: "$(SRCDIR)\Makefile.msc" all-msc $(UNISTD_H)
- $(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)" all
+ $(MAKE) /nologo /f "$(SRCDIR)\Makefile.msc" "prefix=$(prefix)"
"bits=$(bits)" all
check: "$(SRCDIR)\Makefile.msc"
- $(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 monetdb_winconfig.h monetdb_config.h winrules.msc all
$(INSTALL) monetdb_winconfig.h "$(includedir)"
$(INSTALL) monetdb_config.h "$(includedir)"
$(INSTALL) winrules.msc "$(pkgdatadir)"
- $(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) banner.bmp "$(prefix)"
if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) license.rtf "$(prefix)"
if not "$(MAKEDIR)" == "$(prefix)" $(INSTALL) website.html "$(prefix)"
Index: winrules.msc
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/NT/winrules.msc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- winrules.msc 17 Nov 2007 16:30:06 -0000 1.7
+++ winrules.msc 23 Nov 2007 13:47:27 -0000 1.8
@@ -16,11 +16,35 @@
# Portions created by CWI are Copyright (C) 1997-2007 CWI.
# All Rights Reserved.
+!IFNDEF bits
+!IF defined(BITS32)
+bits=32
+!ELSEIF defined(BITS64)
+bits=64
+!ELSE
+bits=32
+!ENDIF
+!ENDIF
+
+!IF $(bits) == 32
+!IFNDEF BITS32
+BITS32=True
+!ENDIF
+!ELSEIF $(bits) == 64
+!IFNDEF BITS64
+BITS64=True
+!ENDIF
+!ENDIF
+
# This is the location of pthreads for Win32,
# see http://sources.redhat.com/pthreads-win32/
PTHREAD = C:\Pthreads
PTHREAD_INCS = "-I$(PTHREAD)\include"
+!IF $(bits) == 32
PTHREAD_LIBS = "$(PTHREAD)\lib\pthreadVC2.lib"
+!ELSE
+PTHREAD_LIBS = "$(PTHREAD)\lib64\pthreadVC2.lib"
+!ENDIF
PHP_INSTDIR = C:\php-525
PHP_SRCDIR = $(PHP_INSTDIR)\php-5.2.5
# for these, also see configure.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-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins
