Update of /cvsroot/monetdb/MonetDB/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv16283/NT
Modified Files:
winrules.msc
Log Message:
propagated changes of Thursday Nov 15 2007 - Saturday Nov 17 2007
from the MonetDB_1-20 branch to the development trunk
Index: winrules.msc
===================================================================
RCS file: /cvsroot/monetdb/MonetDB/NT/winrules.msc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- winrules.msc 24 Oct 2007 08:00:41 -0000 1.6
+++ winrules.msc 17 Nov 2007 16:30:06 -0000 1.7
@@ -21,8 +21,8 @@
PTHREAD = C:\Pthreads
PTHREAD_INCS = "-I$(PTHREAD)\include"
PTHREAD_LIBS = "$(PTHREAD)\lib\pthreadVC2.lib"
-PHP_INSTDIR = C:\php-524
-PHP_SRCDIR = $(PHP_INSTDIR)\php-5.2.4
+PHP_INSTDIR = C:\php-525
+PHP_SRCDIR = $(PHP_INSTDIR)\php-5.2.5
# for these, also see configure.py
PHP_EXTENSIONDIR = lib\php5
@@ -31,6 +31,13 @@
PYTHON_LIBS=$(PYTHONBASE)\libs\python25.lib
PYTHON_LIBDIR=share\MonetDB\python
+!IFDEF HAVE_PCRE
+# This is the loccation of the PCRE library
+LIBPCRE = C:\Program Files\PCRE
+PCRE_LIBS = "$(LIBPCRE)\lib\pcre.lib"
+PCRE_CFLAGS = -DHAVE_LIBPCRE "-I$(LIBPCRE)\include"
+!ENDIF
+
# some programs we use, probably no need to edit
# install python, flex and bison on your systems
-------------------------------------------------------------------------
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
