Opened 12 years ago
Last modified 12 years ago
#4483 closed enhancement
Patch for ingres building and plugin - windows — at Initial Version
| Reported by: | tmitchell | Owned by: | warmerdam |
|---|---|---|---|
| Priority: | normal | Milestone: | 1.9.1 |
| Component: | ConfigBuild | Version: | svn-trunk |
| Severity: | normal | Keywords: | ingres |
| Cc: | zhenchen17@… |
Description
Chen Zhen put together this patch and I wonder if it would be possible to roll it in. I've built it, on Windows, and worked well for me using GDAL trunk last night.
Using the II_SYSTEM variable is typical for Ingres db installs and this build procedure also helps simplify plugin building.
Patch pasted and attached, sorry wasn't sure which is best... Thanks Zhen!
Index: nmake.opt =================================================================== --- nmake.opt (version 23812) +++ nmake.opt (working file) @@ -353,12 +353,18 @@
#MYSQL_LIB = D:\Software\MySQLServer4.1\lib\opt\libmysql.lib advapi32.lib
# INGRES Libraries
-# INGRES_DIR = C:\warmerda\pkg\ingres -# INGRES_INC_DIR = $(INGRES_DIR)\files -# INGRES_LIB = $(INGRES_DIR)\lib\iilibapi.lib \ -# $(INGRES_DIR)\lib\iilibutil.lib \ -# $(INGRES_DIR)\lib\libingres.lib +# Uncomment the following to enable Ingres format. +# INGRES_HOME = $(II_SYSTEM)\ingres +# Uncomment the following if you prefer to build Ingres support as a plugin. +# INGRES_PLUGIN = YES +!IFDEF INGRES_HOME +INGRES_INC_DIR = "$(INGRES_HOME)\files" +INGRES_LIB = "$(INGRES_HOME)\lib\iilibapi.lib" \ + "$(INGRES_HOME)\lib\iilibutil.lib" \ + "$(INGRES_HOME)\lib\libingres.lib" +!ENDIF +
# SQLite Libraries #SQLITE_INC=-IN:\pkg\sqlite-win32 #SQLITE_LIB=N:\pkg\sqlite-win32\sqlite3_i.lib
Index: ogr/ogrsf_frmts/generic/makefile.vc =================================================================== --- ogr/ogrsf_frmts/generic/makefile.vc (version 23812) +++ ogr/ogrsf_frmts/generic/makefile.vc (working file) @@ -44,9 +44,11 @@
SQLITEDEF = -DSQLITE_ENABLED !ENDIF
-!IFDEF INGRES_INC_DIR +!IFDEF INGRES_HOME +!IFNDEF INGRES_PLUGIN
INGRESDEF = -DINGRES_ENABLED !ENDIF
+!ENDIF
!IFDEF OCI_LIB !IFNDEF OCI_PLUGIN
Index: ogr/ogrsf_frmts/makefile.vc =================================================================== --- ogr/ogrsf_frmts/makefile.vc (version 23812) +++ ogr/ogrsf_frmts/makefile.vc (working file) @@ -39,10 +39,12 @@
SQLITE_OBJ = sqlite\*.obj !ENDIF
-!IFDEF INGRES_INC_DIR +!IFDEF INGRES_HOME +!IF "$(INGRES_PLUGIN)" != "YES"
INGRESDIR = ingres INGRESOBJ = ingres\*.obj !ENDIF
+!ENDIF
!IFDEF FME_DIR FMEDIR = fme
Ingres windows build patch