Skip to content

Commit

Permalink
Add Windows build support for pcre (https://trac.osgeo.org/gdal/ticke…
Browse files Browse the repository at this point in the history
…t/4823)

git-svn-id: https://svn.osgeo.org/gdal/trunk@24964 f0d54148-0727-0410-94bb-9a71ac55c965
  • Loading branch information
rouault committed Sep 24, 2012
1 parent a07e705 commit 117cf5a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 2 deletions.
6 changes: 5 additions & 1 deletion gdal/nmake.opt
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down Expand Up @@ -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)

6 changes: 5 additions & 1 deletion gdal/ogr/ogrsf_frmts/sqlite/makefile.vc
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down

0 comments on commit 117cf5a

Please sign in to comment.