Changeset 15785

Show
Ignore:
Timestamp:
29.05.2008 13:23:11 (11 years ago)
Author:
mdewsnip
Message:

(Adding new DB support) First cut at adding sqlite stuff to the Windows makefiles. Likely to change a bit.

Location:
gsdl/trunk
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • gsdl/trunk/lib/win32.mak

    r15580 r15785  
    3535DLLDEBUG = 0 
    3636STLPATH = "$(PACKAGES_DIR)\windows\stlport\stlport" 
     37USE_SQLITE = 0 
    3738 
    3839 
     
    5152!ENDIF 
    5253 
     54!IF $(USE_SQLITE) 
     55SQLITE_INCLUDES = -I$(PACKAGES_DIR)\windows\sqlite\sqlite-amalgamation-3.5.9 
     56SQLITE_OBJECTS = sqlitedbclass.obj 
     57SQLITE_SOURCES = sqlitedbclass.cpp 
     58!ELSE 
     59SQLITE_INCLUDES =  
     60SQLITE_OBJECTS =  
     61SQLITE_SOURCES =  
     62!ENDIF 
     63 
    5364 
    5465AR = lib 
    5566CC = cl 
    56 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN \ 
    57        -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE 
    58 INCLUDES = -I"$(GSDL_DIR)" -I"$(INDEXERS_DIR)\mg\lib" -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" 
     67DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE 
     68INCLUDES = -I"$(GSDL_DIR)" -I"$(INDEXERS_DIR)\mg\lib" -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" $(SQLITE_INCLUDES) 
    5969 
    6070!IF $(GSDL_VC4) 
     
    92102    OIDtools.cpp \ 
    93103    phrases.cpp \ 
    94     text_t.cpp 
     104    text_t.cpp \ 
     105    $(SQLITE_SOURCES) 
    95106 
    96107OBJECTS = \ 
     
    110121    OIDtools.obj \ 
    111122    phrases.obj \ 
    112     text_t.obj 
     123    text_t.obj \ 
     124    $(SQLITE_OBJECTS) 
    113125 
    114126LIBRARY = gsdllib.lib    
  • gsdl/trunk/src/colservr/win32.mak

    r15774 r15785  
    3434DLLDEBUG = 0 
    3535STLPATH = "$(PACKAGES_DIR)\windows\stlport\stlport" 
     36USE_SQLITE = 1 
    3637 
    3738 
     
    5051!ENDIF 
    5152 
     53!IF $(USE_SQLITE) 
     54SQLITE_DEFINES = -DUSE_SQLITE 
     55SQLITE_INCLUDES = -I"$(PACKAGES_DIR)\windows\sqlite\sqlite-amalgamation-3.5.9" 
     56!ELSE 
     57SQLITE_DEFINES =  
     58SQLITE_INCLUDES =  
     59!ENDIF 
     60 
    5261 
    5362AR = lib 
    5463CC = cl 
    55 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -DXML_STATIC -D_CRT_SECURE_NO_DEPRECATE 
     64DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 
     65        -DXML_STATIC $(SQLITE_DEFINES) 
    5666# Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist! 
    5767INCLUDES = -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\lib" \ 
    5868    -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" \ 
    5969    -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text" \ 
    60     -I"$(PACKAGES_DIR)\windows\expat\expat" -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" 
     70    -I"$(PACKAGES_DIR)\windows\expat\expat" -I"$(PACKAGES_DIR)\windows\gdbm\gdbm" $(SQLITE_INCLUDES) 
    6171 
    6272!IF $(GSDL_VC4) 
  • gsdl/trunk/src/recpt/win32.mak

    r15773 r15785  
    3939DLLDEBUG = 0 
    4040ENABLE_ACCENTFOLD = 1 
    41  
    4241STLPATH = "$(PACKAGES_DIR)\windows\stlport\stlport" 
     42USE_SQLITE = 0 
    4343 
    4444 
     
    6161!ELSE 
    6262ACCENTFOLD_LIBS =  
     63!ENDIF 
     64 
     65!IF $(USE_SQLITE) 
     66SQLITE_LIBS = "$(PACKAGES_DIR)\windows\sqlite\sqlite-amalgamation-3.5.9\sqlite3.lib" 
     67!ELSE 
     68SQLITE_LIBS =  
    6369!ENDIF 
    6470 
     
    7682AR = lib 
    7783CC = cl 
    78 DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE -DGSDL_NOCACHE $(Z3950_DEFS) 
     84DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \ 
     85        -DGSDL_NOCACHE $(Z3950_DEFS) 
    7986INCLUDES = -I. -I"$(GSDL_DIR)" -I"$(GSDL_DIR)\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" \ 
    8087    -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mgpp\text" \ 
     
    8390LDFLAGS =  
    8491LIBS = "$(PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 
    85         "$(PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(Z3950_LIBS) 
     92        "$(PACKAGES_DIR)\windows\gdbm\gdbm\gdbm.lib" $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) $(Z3950_LIBS) 
    8693 
    8794!IF $(GSDL_VC4)