Changeset 16574 for gsdl/trunk/runtime-src/src
- Timestamp:
- 2008-07-28T23:46:12+12:00 (16 years ago)
- Location:
- gsdl/trunk/runtime-src/src
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
gsdl/trunk/runtime-src/src/colservr/win32.mak
r15907 r16574 25 25 ########################################################################### 26 26 27 GSDL_DIR = ..\.. 28 INDEXERS_DIR = $(GSDL_DIR)\indexers 29 PACKAGES_DIR = $(GSDL_DIR)\packages 27 GSDL_DIR = ..\..\.. 28 COMMON_DIR = $(GSDL_DIR)\common-src 29 RUNTIME_DIR = $(GSDL_DIR)\runtime-src 30 30 31 INDEXERS_DIR = $(COMMON_DIR)\indexers 32 PACKAGES_DIR = $(RUNTIME_DIR)\packages 31 33 32 34 GSDL_VC4 = 0 … … 64 66 -DXML_STATIC $(SQLITE_DEFINES) 65 67 # Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist! 66 INCLUDES = -I"$(GSDL_DIR)" -I"$( GSDL_DIR)\src\lib" \68 INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" \ 67 69 -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \ 68 70 -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text" \ -
gsdl/trunk/runtime-src/src/oaiservr/win32.mak
r15907 r16574 25 25 ########################################################################### 26 26 27 GSDL_DIR = ..\.. 28 INDEXERS_DIR = $(GSDL_DIR)\indexers 29 PACKAGES_DIR = $(GSDL_DIR)\packages 30 COLSERVR_DIR = $(GSDL_DIR)\src\colservr 31 PROTOCOL_DIR = $(GSDL_DIR)\src\protocol 32 RECPT_DIR = $(GSDL_DIR)\src\recpt 27 GSDL_DIR = ..\..\.. 28 COMMON_DIR = $(GSDL_DIR)\common-src 29 RUNTIME_DIR = $(GSDL_DIR)\runtime-src 30 31 INDEXERS_DIR = $(COMMON_DIR)\indexers 32 PACKAGES_DIR = $(RUNTIME_DIR)\packages 33 COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr 34 PROTOCOL_DIR = $(RUNTIME_DIR)\src\protocol 35 RECPT_DIR = $(RUNTIME_DIR)\src\recpt 33 36 34 37 … … 72 75 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 73 76 -DGSDL_NOCACHE 74 INCLUDES = -I"$( GSDL_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \77 INCLUDES = -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \ 75 78 -I"$(INDEXERS_DIR)\mgpp\text" -I"$(PACKAGES_DIR)\windows\crypt\crypt" \ 76 79 -I"$(PACKAGES_DIR)\windows\expat\expat" -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" … … 148 151 "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \ 149 152 "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib" \ 150 "$( GSDL_DIR)\src\lib\gsdllib.lib"153 "$(COMMON_DIR)\src\lib\gsdllib.lib" 151 154 152 155 EXECUTABLE_OBJECTS = \ -
gsdl/trunk/runtime-src/src/protocol/win32.mak
r15907 r16574 25 25 ########################################################################### 26 26 27 GSDL_DIR = ..\.. 28 INDEXERS_DIR = $(GSDL_DIR)\indexers 29 PACKAGES_DIR = $(GSDL_DIR)\packages 30 COLSERVR_DIR = $(GSDL_DIR)\src\colservr 27 GSDL_DIR = ..\..\.. 28 COMMON_DIR = $(GSDL_DIR)\common-src 29 RUNTIME_DIR = $(GSDL_DIR)\runtime-src 30 31 INDEXERS_DIR = $(COMMON_DIR)\indexers 32 PACKAGES_DIR = $(RUNTIME_DIR)\packages 33 COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr 31 34 32 35 … … 55 58 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE 56 59 # Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist! 57 INCLUDES = -I"$(GSDL_DIR)" -I"$( GSDL_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mgpp\text" \60 INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mgpp\text" \ 58 61 -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" 59 62 -
gsdl/trunk/runtime-src/src/recpt/win32.mak
r15907 r16574 25 25 ########################################################################### 26 26 27 GSDL_DIR = ..\.. 28 INDEXERS_DIR = $(GSDL_DIR)\indexers 29 PACKAGES_DIR = $(GSDL_DIR)\packages 30 COLSERVR_DIR = $(GSDL_DIR)\src\colservr 31 PROTOCOL_DIR = $(GSDL_DIR)\src\protocol 32 Z3950_DIR = $(GSDL_DIR)\src\z3950 27 GSDL_DIR = ..\..\.. 28 COMMON_DIR = $(GSDL_DIR)\common-src 29 RUNTIME_DIR = $(GSDL_DIR)\runtime-src 30 31 INDEXERS_DIR = $(COMMON_DIR)\indexers 32 PACKAGES_DIR = $(RUNTIME_DIR)\packages 33 COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr 34 PROTOCOL_DIR = $(RUNTIME_DIR)\src\protocol 35 Z3950_DIR = $(RUNTIME_DIR)\src\z3950 33 36 34 37 … … 83 86 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 84 87 -DGSDL_NOCACHE $(Z3950_DEFS) 85 INCLUDES = -I. -I"$(GSDL_DIR)" -I"$( GSDL_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \88 INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \ 86 89 -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mgpp\text" \ 87 90 -I"$(PACKAGES_DIR)\windows\crypt\crypt" -I"$(PACKAGES_DIR)\windows\expat\expat" \ … … 209 212 "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \ 210 213 "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib" \ 211 "$( GSDL_DIR)\src\lib\gsdllib.lib"214 "$(COMMON_DIR)\src\lib\gsdllib.lib" 212 215 213 216 EXECUTABLE_OBJECTS = \ -
gsdl/trunk/runtime-src/src/w32server/win32.mak
r15926 r16574 25 25 ########################################################################### 26 26 27 GSDL_DIR = ..\.. 28 INDEXERS_DIR = $(GSDL_DIR)\indexers 29 PACKAGES_DIR = $(GSDL_DIR)\packages 30 COLSERVR_DIR = $(GSDL_DIR)\src\colservr 31 PROTOCOL_DIR = $(GSDL_DIR)\src\protocol 32 RECPT_DIR = $(GSDL_DIR)\src\recpt 27 GSDL_DIR = ..\..\.. 28 COMMON_DIR = $(GSDL_DIR)\common-src 29 RUNTIME_DIR = $(GSDL_DIR)\runtime-src 30 31 INDEXERS_DIR = $(COMMON_DIR)\indexers 32 PACKAGES_DIR = $(RUNTIME_DIR)\packages 33 COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr 34 PROTOCOL_DIR = $(RUNTIME_DIR)\protocol 35 RECPT_DIR = $(RUNTIME_DIR)\src\recpt 33 36 34 37 … … 60 63 CC = cl 61 64 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_LITTLE_ENDIAN -DPARADOCNUM -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE 62 INCLUDES = -I"$(GSDL_DIR)" -I"$( GSDL_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \63 -I"$( GSDL_DIR)\src\colservr" -I"$(GSDL_DIR)\indexers\mg" \65 INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \ 66 -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mg" \ 64 67 -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" \ 65 -I"$( GSDL_DIR)\indexers\mg\lib" -I"$(GSDL_DIR)\indexers\mg\src\text" \66 -I"$( GSDL_DIR)\indexers\mgpp\lib" -I"$(GSDL_DIR)\indexers\mgpp\text"68 -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \ 69 -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text" 67 70 LDFLAGS = 68 71 LIBS = "$(PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ … … 132 135 "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \ 133 136 "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib" \ 134 "$( GSDL_DIR)\src\lib\gsdllib.lib"137 "$(COMMON_DIR)\src\lib\gsdllib.lib" 135 138 136 139 EXECUTABLE_OBJECTS = \ … … 156 159 157 160 # Resources stuff 158 SOURCE = "$( GSDL_DIR)\src\w32server\newgsdl.bmp"159 SOURCE = "$( GSDL_DIR)\src\w32server\resource.h"160 SOURCE = "$( GSDL_DIR)\src\w32server\server.ico"161 SOURCE = "$( GSDL_DIR)\src\w32server\gsdlcol.bmp"162 SOURCE = "$( GSDL_DIR)\src\w32server\server.rc"161 SOURCE = "$(RUNTIME_DIR)\src\w32server\newgsdl.bmp" 162 SOURCE = "$(RUNTIME_DIR)\src\w32server\resource.h" 163 SOURCE = "$(RUNTIME_DIR)\src\w32server\server.ico" 164 SOURCE = "$(RUNTIME_DIR)\src\w32server\gsdlcol.bmp" 165 SOURCE = "$(RUNTIME_DIR)\src\w32server\server.rc" 163 166 DEP_RSC_SERVE=\ 164 "$( GSDL_DIR)\src\w32server\gsdlcol.bmp"\165 "$( GSDL_DIR)\src\w32server\newgsdl.bmp"\166 "$( GSDL_DIR)\src\w32server\server.ico"167 "$(RUNTIME_DIR)\src\w32server\gsdlcol.bmp"\ 168 "$(RUNTIME_DIR)\src\w32server\newgsdl.bmp"\ 169 "$(RUNTIME_DIR)\src\w32server\server.ico" 167 170 168 server.res : $(SOURCE) $(DEP_RSC_SERVE) "$( GSDL_DIR)\src\w32server"169 $(RSC) /l 0x409 /fo"$( GSDL_DIR)\src\w32server\server.res" /i "$(GSDL_DIR)\src\w32server" \171 server.res : $(SOURCE) $(DEP_RSC_SERVE) "$(RUNTIME_DIR)\src\w32server" 172 $(RSC) /l 0x409 /fo"$(RUNTIME_DIR)\src\w32server\server.res" /i "$(RUNTIME_DIR)\src\w32server" \ 170 173 /d "NDEBUG" $(SOURCE) 171 174 172 "$( GSDL_DIR)\src\w32server\server.res" : $(SOURCE) $(DEP_RSC_SERVE) "$(GSDL_DIR)\src\w32server"173 $(RSC) /l 0x409 /fo"$( GSDL_DIR)\src\w32server\server.res" /i "$(GSDL_DIR)\src\w32server" \175 "$(RUNTIME_DIR)\src\w32server\server.res" : $(SOURCE) $(DEP_RSC_SERVE) "$(RUNTIME_DIR)\src\w32server" 176 $(RSC) /l 0x409 /fo"$(RUNTIME_DIR)\src\w32server\server.res" /i "$(RUNTIME_DIR)\src\w32server" \ 174 177 /d "NDEBUG" $(SOURCE) -
gsdl/trunk/runtime-src/src/z3950/win32.mak
r15907 r16574 25 25 ########################################################################### 26 26 27 GSDL_DIR = ..\.. 28 INDEXERS_DIR = $(GSDL_DIR)\indexers 29 PACKAGES_DIR = $(GSDL_DIR)\packages 30 COLSERVR_DIR = $(GSDL_DIR)\src\colservr 31 PROTOCOL_DIR = $(GSDL_DIR)\src\protocol 27 GSDL_DIR = ..\..\.. 28 COMMON_DIR = $(GSDL_DIR)\common-src 29 RUNTIME_DIR = $(GSDL_DIR)\runtime-src 30 31 INDEXERS_DIR = $(COMMON_DIR)\indexers 32 PACKAGES_DIR = $(RUNTIME_DIR)\packages 33 COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr 34 PROTOCOL_DIR = $(RUNTIME_DIR)\src\protocol 32 35 33 36 … … 70 73 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE 71 74 # Do NOT add the "recpt" directory here: the z39.50 code should be independent of the receptionist! 72 INCLUDES = -I"$(GSDL_DIR)" -I"$( GSDL_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \75 INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \ 73 76 -I"$(INDEXERS_DIR)\mgpp\text" -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\include" \ 74 77 -I"$(PACKAGES_DIR)\yaz\yaz-2.1.4\client" -I"$(PACKAGES_DIR)\d2m" \ … … 136 139 $(INDEXERS_DIR)\mgpp/text/libmgpptext.lib \ 137 140 $(INDEXERS_DIR)\mgpp/lib/libmgpplib.lib \ 138 $( GSDL_DIR)\src\lib\gsdllib.lib141 $(COMMON_DIR)\src\lib\gsdllib.lib 139 142 140 143 EXECUTABLE_OBJECTS = \
Note:
See TracChangeset
for help on using the changeset viewer.