Changeset 15522

Timestamp:

2008-05-16T10:31:05+12:00 (16 years ago)

Author:

mdewsnip

Message:

A few consistency improvements to the win32.mak file.

File:

• gsdl/trunk/src/colservr/win32.mak (modified) (3 diffs)

gsdl/trunk/src/colservr/win32.mak

@@ -6 +6 @@
 # University of Waikato, New Zealand.
 #
-# Copyright (C) 1999  The New Zealand Digital Library Project
+# Copyright (C) 1999-2008  The New Zealand Digital Library Project
 #
 #
@@ -25 +25 @@
 ###########################################################################
 
-GSDLHOME = ..\..
+GSDL_DIR = ..\..
+INDEXERS_DIR = $(GSDL_DIR)\indexers
+
+
 GSDL_VC4 = 0
 DLL = 0
 DLLDEBUG = 0
-STLPATH = "$(GSDLHOME)\packages\windows\stlport\stlport"
+STLPATH = "$(GSDL_DIR)\packages\windows\stlport\stlport"
 
 
@@ -50 +53 @@
 CC = cl
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -DXML_STATIC -D_CRT_SECURE_NO_DEPRECATE
-INCLUDES = -I"$(GSDLHOME)" -I"$(GSDLHOME)\lib" -I"$(GSDLHOME)\src\colservr" \
-       -I"$(GSDLHOME)\indexers\mg" \
-       -I"$(GSDLHOME)\indexers\mg\lib" -I"$(GSDLHOME)\indexers\mg\src\text" \
-       -I"$(GSDLHOME)\packages\windows\gdbm\gdbm" \
-           -I"$(GSDLHOME)\indexers\mgpp\lib" -I"$(GSDLHOME)\indexers\mgpp\text" \
-           -I"$(GSDLHOME)\packages\windows\expat\expat"
+# Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist!
+INCLUDES = -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\lib" \
+    -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \
+    -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text" \
+    -I"$(GSDL_DIR)\packages\expat\include" -I"$(GSDL_DIR)\packages\windows\gdbm\gdbm"
 
 !IF $(GSDL_VC4)