Update of /cvsroot/monetdb/MonetDB4/NT
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv23709/NT
Modified Files:
Tag: MonetDB_4-20
rules.msc
Log Message:
Include mapilib/Mapi.h and mapi/mapi.h exclusively. This should fix
all problems with including the wrong file on case-insensitive file
systems.
Added support for PCRE on Windows.
Upgraded to PHP-5.2.4.
Define ssize_t in *config.h on Windows so that it is always avaliable.
Make pipe() available on Windows.
Index: rules.msc
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/NT/rules.msc,v
retrieving revision 1.14.4.1
retrieving revision 1.14.4.2
diff -u -d -r1.14.4.1 -r1.14.4.2
--- rules.msc 18 Sep 2007 20:55:21 -0000 1.14.4.1
+++ rules.msc 2 Oct 2007 11:52:23 -0000 1.14.4.2
@@ -19,14 +19,21 @@
RULESMSC = $(MONETDB_PREFIX)\share\MonetDB\winrules.msc
!INCLUDE $(RULESMSC)
+!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
+
MONETDB_INCLUDEDIR=$(MONETDB_PREFIX)\include
MONETDB_INCS=-I"$(MONETDB_INCLUDEDIR)" -I"$(MONETDB_INCLUDEDIR)\common"
-I"$(MONETDB_INCLUDEDIR)\gdk"
MONETDB_LIBS=/libpath:"$(MONETDB_PREFIX)\lib"
-CLIENTS_INCLUDEDIR=$(CLIENTS_PREFIX)\include
+CLIENTS_INCLUDEDIR=$(CLIENTS_PREFIX)\include\MonetDB
-CLIENTS_INCS=-I"$(CLIENTS_INCLUDEDIR)"
-I"$(CLIENTS_INCLUDEDIR)\MonetDB\mapilib"
+CLIENTS_INCS=-I"$(CLIENTS_INCLUDEDIR)"
CLIENTS_LIBS=/libpath:"$(CLIENTS_PREFIX)\lib"
pkg = MonetDB4
-------------------------------------------------------------------------
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
