From 117cf5a647aa6d7620bd7d95179bb60bca134f67 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Mon, 24 Sep 2012 20:00:16 +0000 Subject: [PATCH] Add Windows build support for pcre (https://trac.osgeo.org/gdal/ticket/4823) git-svn-id: https://svn.osgeo.org/gdal/trunk@24964 f0d54148-0727-0410-94bb-9a71ac55c965 --- gdal/nmake.opt | 6 +++++- gdal/ogr/ogrsf_frmts/sqlite/makefile.vc | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/gdal/nmake.opt b/gdal/nmake.opt index f3f3178c09ad..f0e8c0631fa4 100644 --- a/gdal/nmake.opt +++ b/gdal/nmake.opt @@ -376,6 +376,10 @@ INGRES_LIB = "$(INGRES_HOME)\lib\iilibapi.lib" \ #SQLITE_INC=-IC:\osgeo4w\include -DHAVE_SPATIALITE -DSPATIALITE_AMALGAMATION #SQLITE_LIB=C:\osgeo4w\lib\spatialite_i.lib +# PCRE Library (REGEXP support for SQLite) for example from http://sourceforge.net/projects/gnuwin32/files/pcre/7.0/pcre-7.0.exe/download +#PCRE_INC=-I"C:\Program Files\GNUWin32\include" -DHAVE_PCRE +#PCRE_LIB="C:\Program Files\GNUWin32\lib\pcre.lib" + # Informix Data Blade #INFORMIXDIR="C:\Program Files\IBM\Informix\Client-SDK" #IDB_INC=-I$(INFORMIXDIR)\incl\cpp -I$(INFORMIXDIR)\incl\dmi \ @@ -658,5 +662,5 @@ EXTERNAL_LIBS = $(OGDILIB) $(XERCES_LIB) $(EXPAT_LIB) $(OCI_LIB) $(PG_LIB) \ $(ODBCLIB) $(JASPER_LIB) $(PNG_LIB) $(ADD_LIBS) $(OPENJPEG_LIB) \ $(MRSID_LIDAR_LIB) $(LIBKML_LIBS) $(SOSI_LIBS) $(POPPLER_LIBS) $(PODOFO_LIBS) $(LZMA_LIBS) \ $(LIBICONV_LIBRARY) $(WEBP_LIBS) $(FGDB_LIB_LINK) $(FREEXL_LIBS) $(GTA_LIBS) \ - $(INGRES_LIB) $(LIBXML2_LIB) + $(INGRES_LIB) $(LIBXML2_LIB) $(PCRE_LIB) diff --git a/gdal/ogr/ogrsf_frmts/sqlite/makefile.vc b/gdal/ogr/ogrsf_frmts/sqlite/makefile.vc index 14091714fb47..b97f0b08e79c 100644 --- a/gdal/ogr/ogrsf_frmts/sqlite/makefile.vc +++ b/gdal/ogr/ogrsf_frmts/sqlite/makefile.vc @@ -8,7 +8,11 @@ GDAL_ROOT = ..\..\.. !INCLUDE $(GDAL_ROOT)\nmake.opt -EXTRAFLAGS = -I.. -I..\.. $(SQLITE_INC) +EXTRAFLAGS = -I.. -I..\.. $(SQLITE_INC) $(PCRE_EXTRAFLAGS) + +!IFDEF PCRE_INC +PCRE_EXTRAFLAGS = $(PCRE_INC) +!ENDIF default: $(OBJ)