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

Files:
1 modified

Legend:

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

    r22078 r22080  
    3838DLL = 0 
    3939DLLDEBUG = 0 
    40 USE_GDBM = 1 
    41 USE_JDBM = 1 
    42 USE_SQLITE = 1 
    43 USE_MSSQL = 0 
    4440ENABLE_MG = 1 
    4541ENABLE_MGPP = 1 
     
    6460CXXFLAGS = $(CXXFLAGS) -MDd 
    6561!ENDIF 
    66 !ENDIF 
    67  
    68 !IF $(USE_GDBM) 
    69 GDBM_DEFINES = -DUSE_GDBM 
    70 GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm 
    71 !ELSE 
    72 GDBM_DEFINES =  
    73 GDBM_INCLUDES =  
    74 !ENDIF 
    75  
    76 !IF $(USE_JDBM) 
    77 JDBM_DEFINES = -DUSE_JDBM 
    78 !ELSE 
    79 JDBM_DEFINES =  
    80 !ENDIF 
    81  
    82 !IF $(USE_SQLITE) 
    83 SQLITE_DEFINES = -DUSE_SQLITE 
    84 !ELSE 
    85 SQLITE_DEFINES =  
    86 !ENDIF 
    87  
    88 !IF $(USE_MSSQL) 
    89 MSSQL_DEFINES = -DUSE_MSSQL 
    90 !ELSE 
    91 MSSQL_DEFINES =  
    9262!ENDIF 
    9363 
     
    11585CC = cl 
    11686DEFS = -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) \ 
    11887    $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 
    11988# Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist! 
    12089INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" $(MGPP_INCLUDES) \ 
    121      $(GDBM_INCLUDES) 
     90     -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm" 
    12291 
    12392!IF $(GSDL_VC4)