Changeset 15785 for gsdl/trunk/src
- Timestamp:
- 2008-05-29T13:23:11+12:00 (16 years ago)
- Location:
- gsdl/trunk/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/src/colservr/win32.mak
r15774 r15785 34 34 DLLDEBUG = 0 35 35 STLPATH = "$(PACKAGES_DIR)\windows\stlport\stlport" 36 USE_SQLITE = 1 36 37 37 38 … … 50 51 !ENDIF 51 52 53 !IF $(USE_SQLITE) 54 SQLITE_DEFINES = -DUSE_SQLITE 55 SQLITE_INCLUDES = -I"$(PACKAGES_DIR)\windows\sqlite\sqlite-amalgamation-3.5.9" 56 !ELSE 57 SQLITE_DEFINES = 58 SQLITE_INCLUDES = 59 !ENDIF 60 52 61 53 62 AR = lib 54 63 CC = cl 55 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -DXML_STATIC -D_CRT_SECURE_NO_DEPRECATE 64 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 65 -DXML_STATIC $(SQLITE_DEFINES) 56 66 # Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist! 57 67 INCLUDES = -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\lib" \ 58 68 -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \ 59 69 -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text" \ 60 -I"$(PACKAGES_DIR)\windows\expat\expat" -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" 70 -I"$(PACKAGES_DIR)\windows\expat\expat" -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" $(SQLITE_INCLUDES) 61 71 62 72 !IF $(GSDL_VC4) -
gsdl/trunk/src/recpt/win32.mak
r15773 r15785 39 39 DLLDEBUG = 0 40 40 ENABLE_ACCENTFOLD = 1 41 42 41 STLPATH = "$(PACKAGES_DIR)\windows\stlport\stlport" 42 USE_SQLITE = 0 43 43 44 44 … … 61 61 !ELSE 62 62 ACCENTFOLD_LIBS = 63 !ENDIF 64 65 !IF $(USE_SQLITE) 66 SQLITE_LIBS = "$(PACKAGES_DIR)\windows\sqlite\sqlite-amalgamation-3.5.9\sqlite3.lib" 67 !ELSE 68 SQLITE_LIBS = 63 69 !ENDIF 64 70 … … 76 82 AR = lib 77 83 CC = cl 78 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE -DGSDL_NOCACHE $(Z3950_DEFS) 84 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 85 -DGSDL_NOCACHE $(Z3950_DEFS) 79 86 INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \ 80 87 -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mgpp\text" \ … … 83 90 LDFLAGS = 84 91 LIBS = "$(PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 85 "$(PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $( Z3950_LIBS)92 "$(PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS) 86 93 87 94 !IF $(GSDL_VC4)
Note:
See TracChangeset
for help on using the changeset viewer.