Changeset 18079 for gsdl/trunk/common-src/src

Timestamp:

2008-12-04T14:46:04+13:00 (15 years ago)

Author:

mdewsnip

Message:

Fixes to win32.mak for the new GDBM library.

File:

• gsdl/trunk/common-src/src/lib/win32.mak (modified) (3 diffs)

gsdl/trunk/common-src/src/lib/win32.mak

@@ -26 +26 @@
 
 GSDL_DIR = ..\..\..
-INDEXERS_DIR = $(GSDL_DIR)\common-src\indexers
-PACKAGES_DIR = $(GSDL_DIR)\common-src\packages
+COMMON_DIR = $(GSDLHOME)\common-src
+
+INDEXERS_DIR = $(COMMON_DIR)\indexers
+COMMON_PACKAGES_DIR = $(COMMON_DIR)\packages
 
 
@@ -61 +63 @@
 
 !IF $(USE_SQLITE)
-SQLITE_INCLUDES = -I"$(PACKAGES_DIR)\sqlite\include"
+SQLITE_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\sqlite\include"
 SQLITE_OBJECTS = sqlitedbclass.obj
 SQLITE_SOURCES = sqlitedbclass.cpp
@@ -74 +76 @@
 CC = cl
 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
-INCLUDES = -I"$(GSDL_DIR)" -I"$(INDEXERS_DIR)\mg\lib" -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" $(SQLITE_INCLUDES)
+INCLUDES = -I"$(GSDL_DIR)" -I"$(INDEXERS_DIR)\mg\lib" \
+    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" \
+    $(SQLITE_INCLUDES)
 
 !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_DIR)\windows\stlport\stlport"
 !ENDIF
 !IF $(LOCAL_LIBRARY)