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/z3950/win32.mak

    r22078 r22080  
    4141DLLDEBUG = 0 
    4242ENABLE_ACCENTFOLD = 1 
    43 USE_GDBM = 1 
    44 USE_JDBM = 1 
    4543USE_SQLITE = 1 
    46 USE_MSSQL = 0 
    4744ENABLE_MG = 1 
    4845ENABLE_MGPP = 1 
     
    7572!ENDIF 
    7673 
    77 !IF $(USE_GDBM) 
    78 GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" \ 
    79     -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" 
    80 GDBM_LIBS = "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" 
    81 GDBM_DEFINES = -DUSE_GDBM 
    82 !ELSE 
    83 GDBM_INCLUDES =  
    84 GDBM_LIBS =  
    85 GDBM_DEFINES = 
    86 !ENDIF 
    87  
    88 !IF $(USE_JDBM) 
    89 JDBM_DEFINES = -DUSE_JDBM 
    90 !ELSE 
    91 JDBM_DEFINES = 
    92 !ENDIF 
    93  
    9474!IF $(USE_SQLITE) 
    95 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib 
    96 SQLITE_DEFINES = -DUSE_SQLITE 
     75SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib" 
    9776!ELSE 
    9877SQLITE_LIBS =  
    99 SQLITE_DEFINES = 
    100 !ENDIF 
    101  
    102 !IF $(USE_MSSQL) 
    103 MSSQL_DEFINES = -DUSE_MSSQL 
    104 !ELSE 
    105 MSSQL_DEFINES = 
    10678!ENDIF 
    10779 
     
    135107CC = cl 
    136108DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 
    137     $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES) \ 
    138109    $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS) 
    139110# Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist! 
     
    141112    $(MGPP_INCLUDES) -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\include" \ 
    142113    -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\client" -I"$(PACKAGES_DIR)\d2m" \ 
    143     $(GDBM_INCLUDES) 
     114    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" 
    144115LDFLAGS =  
    145 LIBS = "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" $(GDBM_LIBS) \ 
     116LIBS = "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" "$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\gdbm.lib" \ 
    146117        "$(PACKAGES_DIR)\d2m\libd2m.lib" "$(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib" $(ACCENTFOLD_LIBS) \ 
    147118    $(SQLITE_LIBS)