Changeset 18048 for gsdl/trunk/runtime-src/src/colservr/win32.mak

Timestamp:

2008-12-04T09:33:05+13:00 (15 years ago)

Author:

mdewsnip

Message:

Argh, somebody has messed up the nice tidy makefiles, and added a whole bunch of bad paths (particularly for Z39.50 compilation)...

File:

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

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

@@ -30 +30 @@
 
 INDEXERS_DIR = $(COMMON_DIR)\indexers
+COMMON_PACKAGES_DIR = $(COMMON_DIR)\packages
 PACKAGES_DIR = $(RUNTIME_DIR)\packages
 
@@ -55 +56 @@
 !IF $(USE_SQLITE)
 SQLITE_DEFINES = -DUSE_SQLITE
-SQLITE_INCLUDES = -I"$(COMMON_DIR)\packages\sqlite\include"
+SQLITE_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\sqlite\include"
 !ELSE
 SQLITE_DEFINES = 
@@ -76 +77 @@
     -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"$(COMMON_DIR)\packages\windows\expat\expat" -I"$(COMMON_DIR)\packages\windows\gdbm\gdbm" $(SQLITE_INCLUDES)
+    -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" -I"$(COMMON_PACKAGES_DIR)\windows\gdbm\gdbm" $(SQLITE_INCLUDES)
 
 !IF $(GSDL_VC4)
 DEFS=$(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
-INCLUDES = $(INCLUDES) -I"$(COMMON_DIR)\packages\windows\stlport\stlport"
+INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\stlport\stlport"
 !ENDIF