Changeset 15546 for gsdl/trunk/src/w32server/win32.mak

Timestamp:

2008-05-16T15:32:08+12:00 (16 years ago)

Author:

mdewsnip

Message:

Added a new "PACKAGE_DIRS" path value in the Makefiles to make paths a bit shorter.

File:

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

gsdl/trunk/src/w32server/win32.mak

@@ -27 +27 @@
 GSDL_DIR = ..\..
 INDEXERS_DIR = $(GSDL_DIR)\indexers
+PACKAGES_DIR = $(GSDL_DIR)\packages
 COLSERVR_DIR = $(GSDL_DIR)\src\colservr
 PROTOCOL_DIR = $(GSDL_DIR)\src\protocol
@@ -33 +34 @@
 
 GSDL_VC4 = 0
-STLPATH = "$(GSDL_DIR)\packages\windows\stlport\stlport"
+STLPATH = "$(PACKAGES_DIR)\windows\stlport\stlport"
 ENABLE_ACCENTFOLD = 1
 
@@ -44 +45 @@
 
 !IF $(ENABLE_ACCENTFOLD)
-ACCENTFOLD_LIBS = "$(GSDL_DIR)\indexers\packages\unac\libunac.lib" "$(GSDL_DIR)\indexers\packages\unac\iconv.lib"
+ACCENTFOLD_LIBS = "$(INDEXERS_DIR)\packages\unac\libunac.lib" "$(INDEXERS_DIR)\packages\unac\iconv.lib"
 !ELSE
 ACCENTFOLD_LIBS = 
@@ -55 +56 @@
        -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
 INCLUDES = -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
-       -I"$(GSDL_DIR)\src\colservr" -I"$(GSDL_DIR)\indexers\mg" \
-       -I"$(GSDL_DIR)\packages\windows\gdbm\gdbm" \
-           -I"$(GSDL_DIR)\indexers\mg\lib" -I"$(GSDL_DIR)\indexers\mg\src\text" \
-           -I"$(GSDL_DIR)\indexers\mgpp\lib" -I"$(GSDL_DIR)\indexers\mgpp\text"
+    -I"$(GSDL_DIR)\src\colservr" -I"$(GSDL_DIR)\indexers\mg" \
+    -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" \
+        -I"$(GSDL_DIR)\indexers\mg\lib" -I"$(GSDL_DIR)\indexers\mg\src\text" \
+        -I"$(GSDL_DIR)\indexers\mgpp\lib" -I"$(GSDL_DIR)\indexers\mgpp\text"
 LDFLAGS =
-LIBS = "$(GSDL_DIR)\packages\windows\crypt\crypt\crypt.lib" "$(GSDL_DIR)\packages\windows\expat\expat\libexpat.lib" \
-        "$(GSDL_DIR)\packages\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(Z3950_LIBS)
+LIBS = "$(PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \
+        "$(PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(Z3950_LIBS)
 RSC = rc
 WINLIBS = kernel32.lib user32.lib gdi32.lib winspool.lib \