Changeset 22090 for main/trunk/greenstone2/common-src/src/lib/win32.mak

Timestamp:

2010-05-14T19:29:30+12:00 (14 years ago)

Author:

ak19

Message:

Windows makefiles to work with USE_GDBM and USE_JDBM: 1. Added winMake.bat to both gs-jdbm-1.0.tar.gz and common-src's jdbmedit so that jdbm java files can now get compiled up. 2. These new winMake bat files are then called from the updated windows makefiles in common-src and common-src's src-lib folder. 3. Changed win32.mak files to work with USE_GDBM and USE_JDBM: these set their USE_DBDEFINES flag when on to prevent memory errors due to makefiles' inconsistent setting of USE_DEFINES between folders. Also certain gdbm related lib, includes and dir statements are moved out of the general part of the windows makefiles into the USE_GDBM section of the makefiles.

File:

• main/trunk/greenstone2/common-src/src/lib/win32.mak (modified) (5 diffs)

main/trunk/greenstone2/common-src/src/lib/win32.mak

@@ -36 +36 @@
 DLL = 0
 DLLDEBUG = 0
+USE_GDBM = 1
+USE_JDBM = 1
 USE_SQLITE = 1
 USE_MSSQL = 0
-ENABLE_JDBM=1
 
 !IF $(DEBUG)
@@ -64 +65 @@
 MSSQL_OBJECTS = mssqldbclass.obj
 MSSQL_SOURCES = mssqldbclass.cpp
+MSSQL_DEFINES = -DUSE_MSSQL
 !ELSE
 MSSQL_OBJECTS = 
 MSSQL_SOURCES =
+MSSQL_DEFINES =
 !ENDIF
 
@@ -73 +76 @@
 SQLITE_OBJECTS = sqlitedbclass.obj
 SQLITE_SOURCES = sqlitedbclass.cpp
+SQLITE_DEFINES = -DUSE_SQLITE
 !ELSE
 SQLITE_INCLUDES = 
 SQLITE_OBJECTS = 
 SQLITE_SOURCES = 
-!ENDIF
-
-!IF $(ENABLE_JDBM)
+SQLITE_DEFINES =
+!ENDIF
+
+!IF $(USE_GDBM)
+GDBM_LIBS =
+GDBM_SOURCES = gdbmclass.cpp
+GDBM_OBJECTS = gdbmclass.obj
+GDBM_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" \
+    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows"
+GDBM_DEFINES = -DUSE_GDBM
+!ELSE
+GDBM_LIBS = 
+GDBM_SOURCES =
+GDBM_OBJECTS =
+GDBM_INCLUDES = 
+GDBM_DEFINES = 
+!ENDIF
+
+!IF $(USE_JDBM)
 JDBM_SOURCES = jdbmnaiveclass.cpp 
 JDBM_OBJECTS = jdbmnaiveclass.obj
+JDBM_DEFINES = -DUSE_JDBM
 !ELSE
 JDBM_SOURCES =
 JDBM_OBJECTS =
+JDBM_DEFINES =
 !ENDIF
 
 AR = lib
 CC = cl
-DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE
+DEFS = -D__WIN32__ -DHAVE_CONFIG_H -DPARADOCNUM -D_LITTLE_ENDIAN -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
+    $(GDBM_DEFINES) $(JDBM_DEFINES) $(SQLITE_DEFINES) $(MSSQL_DEFINES)
 INCLUDES = -I"$(COMMON_DIR)" \
-    -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" \
+    $(GDBM_INCLUDES) \
     $(SQLITE_INCLUDES)
 
@@ -119 +142 @@
     display.cpp \
     fileutil.cpp \
-    gdbmclass.cpp \
+    $(GDBM_SOURCES) \
     gsdlsitecfg.cpp \
     gsdltimes.cpp \
@@ -142 +165 @@
     display.obj \
     fileutil.obj \
-    gdbmclass.obj \
+    $(GDBM_OBJECTS) \
     gsdlsitecfg.obj \
     gsdltimes.obj \