Changeset 16574 for gsdl/trunk/runtime-src/src/recpt/win32.mak

Timestamp:

2008-07-28T23:46:12+12:00 (16 years ago)

Author:

davidb

Message:

Adjustments to Windows makes file for new common-src, build-src and runtime-src file structure

File:

• gsdl/trunk/runtime-src/src/recpt/win32.mak (modified) (3 diffs)

gsdl/trunk/runtime-src/src/recpt/win32.mak

@@ -25 +25 @@
 ###########################################################################
 
-GSDL_DIR = ..\..
-INDEXERS_DIR = $(GSDL_DIR)\indexers
-PACKAGES_DIR = $(GSDL_DIR)\packages
-COLSERVR_DIR = $(GSDL_DIR)\src\colservr
-PROTOCOL_DIR = $(GSDL_DIR)\src\protocol
-Z3950_DIR = $(GSDL_DIR)\src\z3950
+GSDL_DIR = ..\..\..
+COMMON_DIR = $(GSDL_DIR)\common-src
+RUNTIME_DIR = $(GSDL_DIR)\runtime-src
+
+INDEXERS_DIR = $(COMMON_DIR)\indexers
+PACKAGES_DIR = $(RUNTIME_DIR)\packages
+COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr
+PROTOCOL_DIR = $(RUNTIME_DIR)\src\protocol
+Z3950_DIR    = $(RUNTIME_DIR)\src\z3950
 
 
@@ -83 +86 @@
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
         -DGSDL_NOCACHE $(Z3950_DEFS)
-INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
+INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \
     -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mgpp\text" \
     -I"$(PACKAGES_DIR)\windows\crypt\crypt" -I"$(PACKAGES_DIR)\windows\expat\expat" \
@@ -209 +212 @@
     "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \
     "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib" \
-    "$(GSDL_DIR)\src\lib\gsdllib.lib"
+    "$(COMMON_DIR)\src\lib\gsdllib.lib"
 
 EXECUTABLE_OBJECTS = \