Changeset 16577 for gsdl/trunk/runtime-src/src/w32server/win32.mak

Timestamp:

2008-07-29T12:05:44+12:00 (16 years ago)

Author:

davidb

Message:

Minor tweaks to windows make files

File:

• gsdl/trunk/runtime-src/src/w32server/win32.mak (modified) (4 diffs)

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

@@ -30 +30 @@
 
 INDEXERS_DIR = $(COMMON_DIR)\indexers
+COMMON_PACKAGES = $(COMMON_DIR)\packages
+
 PACKAGES_DIR = $(RUNTIME_DIR)\packages
 COLSERVR_DIR = $(RUNTIME_DIR)\src\colservr
-PROTOCOL_DIR = $(RUNTIME_DIR)\protocol
+PROTOCOL_DIR = $(RUNTIME_DIR)\src\protocol
 RECPT_DIR    = $(RUNTIME_DIR)\src\recpt
 
@@ -54 +56 @@
 
 !IF $(USE_SQLITE)
-SQLITE_LIBS = "$(PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
+SQLITE_LIBS = "$(COMMON_PACKAGES)\sqlite\lib\sqlite3.lib"
 !ELSE
 SQLITE_LIBS = 
@@ -65 +67 @@
 INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
     -I"$(COLSERVR_DIR)" -I"$(INDEXERS_DIR)\mg" \
-    -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" \
+    -I"$(COMMON_PACKAGES)\windows\gdbm\gdbm" \
         -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \
         -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text"
 LDFLAGS =
-LIBS = "$(PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
-        "$(PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
+LIBS = "$(COMMON_PACKAGES)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES)\windows\expat\expat\libexpat.lib" \
+        "$(COMMON_PACKAGES)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS)
 RSC = rc
 WINLIBS = kernel32.lib user32.lib gdi32.lib winspool.lib \
@@ -80 +82 @@
 !IF $(GSDL_VC4)
 DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS
-INCLUDES = $(INCLUDES) -I"$(PACKAGES_DIR)\windows\stlport\stlport"
+INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES)\windows\stlport\stlport"
 !ENDIF