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

Timestamp:

2010-05-12T20:43:56+12:00 (14 years ago)

Author:

ak19

Message:

Undoing partial commit: accidentally committed windows makefiles along with the Linux makefiles which were the only ones I wanted to commit. Undoing commit because the changes are untested and only some changed files were committed.

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
@@ -64 +60 @@
 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
 
@@ -115 +85 @@
 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) \
-     $(GDBM_INCLUDES)
+     -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm"
 
 !IF $(GSDL_VC4)