Changeset 18079

Show
Ignore:
Timestamp:
04.12.2008 14:46:04 (11 years ago)
Author:
mdewsnip
Message:

Fixes to win32.mak for the new GDBM library.

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/common-src/src/lib/win32.mak

    r18076 r18079  
    2626 
    2727GSDL_DIR = ..\..\.. 
    28 INDEXERS_DIR = $(GSDL_DIR)\common-src\indexers 
    29 PACKAGES_DIR = $(GSDL_DIR)\common-src\packages 
     28COMMON_DIR = $(GSDLHOME)\common-src 
     29 
     30INDEXERS_DIR = $(COMMON_DIR)\indexers 
     31COMMON_PACKAGES_DIR = $(COMMON_DIR)\packages 
    3032 
    3133 
     
    6163 
    6264!IF $(USE_SQLITE) 
    63 SQLITE_INCLUDES = -I"$(PACKAGES_DIR)\sqlite\include" 
     65SQLITE_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\sqlite\include" 
    6466SQLITE_OBJECTS = sqlitedbclass.obj 
    6567SQLITE_SOURCES = sqlitedbclass.cpp 
     
    7476CC = cl 
    7577DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE 
    76 INCLUDES = -I"$(GSDL_DIR)" -I"$(INDEXERS_DIR)\mg\lib" -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" $(SQLITE_INCLUDES) 
     78INCLUDES = -I"$(GSDL_DIR)" -I"$(INDEXERS_DIR)\mg\lib" \ 
     79    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" \ 
     80    $(SQLITE_INCLUDES) 
    7781 
    7882!IF $(GSDL_VC4) 
    7983DEFS = $(DEFS) -DGSDL_NAMESPACE_BROKEN -DGSDL_USE_IOS_H -D__STL_NO_NEW_IOSTREAMS 
    80 INCLUDES = $(INCLUDES) -I"$(PACKAGES_DIR)\windows\stlport\stlport" 
     84INCLUDES = $(INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\stlport\stlport" 
    8185!ENDIF 
    8286!IF $(LOCAL_LIBRARY)