Show
Ignore:
Timestamp:
15.01.2010 15:16:03 (11 years ago)
Author:
mdewsnip
Message:

Created USE_GDBM and USE_JDBM defines that work similar to USE_SQLITE and USE_MSSQL for controlling which infodb types are compiled in. Currently these are not configurable through the configure scripts and are always on.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/src/colservr/win32.mak

    r21435 r21472  
    3737DLL = 0 
    3838DLLDEBUG = 0 
     39USE_GDBM = 1 
     40USE_JDBM = 1 
    3941USE_SQLITE = 1 
    4042USE_MSSQL = 0 
     
    6264CXXFLAGS = $(CXXFLAGS) -MDd 
    6365!ENDIF 
     66!ENDIF 
     67 
     68!IF $(USE_GDBM) 
     69GDBM_DEFINES = -DUSE_GDBM 
     70GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" 
     71!ELSE 
     72GDBM_DEFINES =  
     73GDBM_INCLUDES =  
     74!ENDIF 
     75 
     76!IF $(USE_JDBM) 
     77JDBM_DEFINES = -DUSE_JDBM 
     78!ELSE 
     79JDBM_DEFINES =  
    6480!ENDIF 
    6581 
     
    124140CC = cl 
    125141DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 
    126         -DXML_STATIC $(SQLITE_DEFINES) $(MSSQL_DEFINES) $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 
     142        -DXML_STATIC $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \ 
     143    $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 
    127144# Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist! 
    128145INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" \ 
    129146    $(MG_INCLUDES) \ 
    130147    $(MGPP_INCLUDES) \ 
    131     -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" \ 
    132     -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" $(SQLITE_INCLUDES) 
     148    -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" $(GDBM_INCLUDES) $(SQLITE_INCLUDES) 
    133149 
    134150!IF $(GSDL_VC4)