Changeset 18048
- Timestamp:
- 2008-12-04T09:33:05+13:00 (15 years ago)
- Location:
- gsdl/trunk/runtime-src/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/runtime-src/src/colservr/win32.mak
r17476 r18048 30 30 31 31 INDEXERS_DIR = $(COMMON_DIR)\indexers 32 COMMON_PACKAGES_DIR = $(COMMON_DIR)\packages 32 33 PACKAGES_DIR = $(RUNTIME_DIR)\packages 33 34 … … 55 56 !IF $(USE_SQLITE) 56 57 SQLITE_DEFINES = -DUSE_SQLITE 57 SQLITE_INCLUDES = -I"$(COMMON_ DIR)\packages\sqlite\include"58 SQLITE_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\sqlite\include" 58 59 !ELSE 59 60 SQLITE_DEFINES = … … 76 77 -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \ 77 78 -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text" \ 78 -I"$(COMMON_ DIR)\packages\windows\expat\expat" -I"$(COMMON_DIR)\packages\windows\gdbm\gdbm" $(SQLITE_INCLUDES)79 -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm" $(SQLITE_INCLUDES) 79 80 80 81 !IF $(GSDL_VC4) 81 82 DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 82 INCLUDES = $(INCLUDES) -I"$(COMMON_ DIR)\packages\windows\stlport\stlport"83 INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\stlport\stlport" 83 84 !ENDIF 84 85 -
gsdl/trunk/runtime-src/src/oaiservr/win32.mak
r16908 r18048 30 30 31 31 INDEXERS_DIR = $(COMMON_DIR)\indexers 32 COMMON_PACKAGES = $(COMMON_DIR)\packages 33 32 COMMON_PACKAGES_DIR = $(COMMON_DIR)\packages 34 33 PACKAGES_DIR = $(RUNTIME_DIR)\packages 35 34 COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr … … 67 66 68 67 !IF $(USE_SQLITE) 69 SQLITE_LIBS = "$(COMMON_PACKAGES )\sqlite\lib\sqlite3.lib"68 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib" 70 69 !ELSE 71 70 SQLITE_LIBS = … … 78 77 -DGSDL_NOCACHE 79 78 INCLUDES = -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \ 80 -I"$(INDEXERS_DIR)\mgpp\text" -I"$(COMMON_PACKAGES )\windows\crypt\crypt" \81 -I"$(COMMON_PACKAGES )\windows\expat\expat" -I"$(COMMON_PACKAGES)\windows\gdbm\gdbm"79 -I"$(INDEXERS_DIR)\mgpp\text" -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" \ 80 -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm" 82 81 LDFLAGS = 83 LIBS = "$(COMMON_PACKAGES )\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES)\windows\expat\expat\libexpat.lib" \84 "$(COMMON_PACKAGES )\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)82 LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 83 "$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 85 84 86 85 !IF $(GSDL_VC4) 87 86 DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 88 INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES )\windows\stlport\stlport"87 INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\stlport\stlport" 89 88 !ENDIF 90 89 !IF $(LOCAL_LIBRARY) -
gsdl/trunk/runtime-src/src/protocol/win32.mak
r16577 r18048 30 30 31 31 INDEXERS_DIR = $(COMMON_DIR)\indexers 32 COMMON_PACKAGES = $(COMMON_DIR)\packages 33 32 COMMON_PACKAGES_DIR = $(COMMON_DIR)\packages 34 33 COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr 35 34 … … 60 59 # Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist! 61 60 INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mgpp\text" \ 62 -I"$(COMMON_PACKAGES )\windows\gdbm\gdbm"61 -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm" 63 62 64 63 !IF $(GSDL_VC4) 65 64 DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 66 INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES )\windows\stlport\stlport"65 INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\stlport\stlport" 67 66 !ENDIF 68 67 -
gsdl/trunk/runtime-src/src/recpt/win32.mak
r16908 r18048 30 30 31 31 INDEXERS_DIR = $(COMMON_DIR)\indexers 32 COMMON_PACKAGES = $(COMMON_DIR)\packages 33 34 32 COMMON_PACKAGES_DIR = $(COMMON_DIR)\packages 35 33 PACKAGES_DIR = $(RUNTIME_DIR)\packages 36 34 COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr … … 69 67 70 68 !IF $(USE_SQLITE) 71 SQLITE_LIBS = "$(COMMON_PACKAGES )\sqlite\lib\sqlite3.lib"69 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib" 72 70 !ELSE 73 71 SQLITE_LIBS = … … 77 75 Z3950_DEFS = -DUSE_Z3950 78 76 Z3950_INCLUDES = -I$(Z3950_DIR) 79 Z3950_LIBS = $(Z3950_DIR)\gsdlz3950.lib $( COMMON_PACKAGES)\yaz\yaz-2.1.4\lib\yaz.lib77 Z3950_LIBS = $(Z3950_DIR)\gsdlz3950.lib $(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib 80 78 !ELSE 81 79 Z3950_DEFS = … … 91 89 INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \ 92 90 -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mgpp\text" \ 93 -I"$(COMMON_PACKAGES )\windows\crypt\crypt" -I"$(COMMON_PACKAGES)\windows\expat\expat" \94 -I"$(COMMON_PACKAGES )\windows\gdbm\gdbm" $(Z3950_INCLUDES)91 -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" \ 92 -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm" $(Z3950_INCLUDES) 95 93 LDFLAGS = 96 LIBS = "$(COMMON_PACKAGES )\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES)\windows\expat\expat\libexpat.lib" \97 "$(COMMON_PACKAGES )\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS)94 LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 95 "$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS) 98 96 99 97 !IF $(GSDL_VC4) 100 98 DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 101 INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES )\windows\stlport\stlport"99 INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\stlport\stlport" 102 100 !ENDIF 103 101 !IF $(LOCAL_LIBRARY) -
gsdl/trunk/runtime-src/src/w32server/win32.mak
r16908 r18048 30 30 31 31 INDEXERS_DIR = $(COMMON_DIR)\indexers 32 COMMON_PACKAGES = $(COMMON_DIR)\packages 33 32 COMMON_PACKAGES_DIR = $(COMMON_DIR)\packages 34 33 PACKAGES_DIR = $(RUNTIME_DIR)\packages 35 34 COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr … … 56 55 57 56 !IF $(USE_SQLITE) 58 SQLITE_LIBS = "$(COMMON_PACKAGES )\sqlite\lib\sqlite3.lib"57 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib" 59 58 !ELSE 60 59 SQLITE_LIBS = … … 67 66 INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \ 68 67 -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mg" \ 69 -I"$(COMMON_PACKAGES )\windows\gdbm\gdbm" \68 -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm" \ 70 69 -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \ 71 70 -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text" 72 71 LDFLAGS = 73 LIBS = "$(COMMON_PACKAGES )\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES)\windows\expat\expat\libexpat.lib" \74 "$(COMMON_PACKAGES )\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)72 LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 73 "$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 75 74 RSC = rc 76 75 WINLIBS = kernel32.lib user32.lib gdi32.lib winspool.lib \ … … 82 81 !IF $(GSDL_VC4) 83 82 DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 84 INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES )\windows\stlport\stlport"83 INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\stlport\stlport" 85 84 !ENDIF 86 85 -
gsdl/trunk/runtime-src/src/z3950/win32.mak
r16908 r18048 30 30 31 31 INDEXERS_DIR = $(COMMON_DIR)\indexers 32 COMMON_PACKAGES_DIR = $(COMMON_DIR)\packages 32 33 PACKAGES_DIR = $(RUNTIME_DIR)\packages 33 34 COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr … … 63 64 64 65 !IF $(USE_SQLITE) 65 SQLITE_LIBS = "$( PACKAGES_DIR)\sqlite\lib\sqlite3.lib"66 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib" 66 67 !ELSE 67 68 SQLITE_LIBS = … … 76 77 -I"$(INDEXERS_DIR)\mgpp\text" -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\include" \ 77 78 -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\client" -I"$(PACKAGES_DIR)\d2m" \ 78 -I"$( PACKAGES_DIR)\windows\gdbm\gdbm"79 -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm" 79 80 LDFLAGS = 80 LIBS = "$( PACKAGES_DIR)\windows\expat\expat\libexpat.lib" "$(PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" \81 LIBS = "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" "$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" \ 81 82 "$(PACKAGES_DIR)\d2m\libd2m.lib" "$(PACKAGES_DIR)\yaz\yaz-2.1.4\lib\yaz.lib" $(ACCENTFOLD_LIBS) \ 82 83 $(SQLITE_LIBS) … … 84 85 !IF $(GSDL_VC4) 85 86 DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 86 INCLUDES = $(INCLUDES) -I"$( PACKAGES_DIR)\windows\stlport\stlport"87 INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\stlport\stlport" 87 88 !ENDIF 88 89
Note:
See TracChangeset
for help on using the changeset viewer.