Changeset 22078 for main/trunk/greenstone2/runtime-src/src/protocol/win32.mak

Timestamp:

2010-05-12T20:33:31+12:00 (14 years ago)

Author:

ak19

Message:

1. Missing conditional LIBS or INCLUDES or DIR declaration for when USE_GDBM is switched on. Previously it used to always put these in the includes/libs, not it only does so on USE_GDBM.

File:

• main/trunk/greenstone2/runtime-src/src/protocol/win32.mak (modified) (3 diffs)

main/trunk/greenstone2/runtime-src/src/protocol/win32.mak

@@ -38 +38 @@
 DLL = 0
 DLLDEBUG = 0
+USE_GDBM = 1
+USE_JDBM = 1
+USE_SQLITE = 1
+USE_MSSQL = 0
 ENABLE_MG = 1
 ENABLE_MGPP = 1
@@ -60 +64 @@
 CXXFLAGS = $(CXXFLAGS) -MDd
 !ENDIF
+!ENDIF
+
+!IF $(USE_GDBM)
+GDBM_DEFINES = -DUSE_GDBM
+GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm
+!ELSE
+GDBM_DEFINES = 
+GDBM_INCLUDES = 
+!ENDIF
+
+!IF $(USE_JDBM)
+JDBM_DEFINES = -DUSE_JDBM
+!ELSE
+JDBM_DEFINES = 
+!ENDIF
+
+!IF $(USE_SQLITE)
+SQLITE_DEFINES = -DUSE_SQLITE
+!ELSE
+SQLITE_DEFINES = 
+!ENDIF
+
+!IF $(USE_MSSQL)
+MSSQL_DEFINES = -DUSE_MSSQL
+!ELSE
+MSSQL_DEFINES = 
 !ENDIF
 
@@ -85 +115 @@
 CC = cl
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
+    $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \
     $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS)
 # Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist!
 INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" $(MGPP_INCLUDES) \
-     -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm"
+     $(GDBM_INCLUDES)
 
 !IF $(GSDL_VC4)