Show
Ignore:
Timestamp:
12.05.2010 20:33:31 (10 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.

Files:
1 modified

Legend:

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

    r21945 r22078  
    3838DLL = 0 
    3939DLLDEBUG = 0 
     40USE_GDBM = 1 
     41USE_JDBM = 1 
     42USE_SQLITE = 1 
     43USE_MSSQL = 0 
    4044ENABLE_MG = 1 
    4145ENABLE_MGPP = 1 
     
    6064CXXFLAGS = $(CXXFLAGS) -MDd 
    6165!ENDIF 
     66!ENDIF 
     67 
     68!IF $(USE_GDBM) 
     69GDBM_DEFINES = -DUSE_GDBM 
     70GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm 
     71!ELSE 
     72GDBM_DEFINES =  
     73GDBM_INCLUDES =  
     74!ENDIF 
     75 
     76!IF $(USE_JDBM) 
     77JDBM_DEFINES = -DUSE_JDBM 
     78!ELSE 
     79JDBM_DEFINES =  
     80!ENDIF 
     81 
     82!IF $(USE_SQLITE) 
     83SQLITE_DEFINES = -DUSE_SQLITE 
     84!ELSE 
     85SQLITE_DEFINES =  
     86!ENDIF 
     87 
     88!IF $(USE_MSSQL) 
     89MSSQL_DEFINES = -DUSE_MSSQL 
     90!ELSE 
     91MSSQL_DEFINES =  
    6292!ENDIF 
    6393 
     
    85115CC = cl 
    86116DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 
     117    $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \ 
    87118    $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 
    88119# Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist! 
    89120INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" $(MGPP_INCLUDES) \ 
    90      -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm" 
     121     $(GDBM_INCLUDES) 
    91122 
    92123!IF $(GSDL_VC4)