Changeset 22090 for main/trunk/greenstone2/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/win32.mak (modified) (2 diffs)

main/trunk/greenstone2/win32.mak

@@ -33 +33 @@
 DLL = 0
 DLLDEBUG = 0
+# The main database backends are enabled by default
+USE_GDBM = 1
+USE_JDBM = 1
 # USE_SQLITE is enabled by default for GS2. Need to turn off explicitly for GS3 in build.xml
 USE_SQLITE = 1
@@ -73 +76 @@
 !IF $(DLLDEBUG)
 MAKECMD = $(MAKECMD) DLLDEBUG=1
+!ENDIF
+!IF !$(USE_GDBM)
+MAKECMD = $(MAKECMD) USE_GDBM=0
+!ENDIF
+!IF !$(USE_JDBM)
+MAKECMD = $(MAKECMD) USE_JDBM=0
 !ENDIF
 !IF !$(USE_SQLITE)