Changeset 21945 for main/trunk/greenstone2/runtime-src/src/w32server/win32.mak

Timestamp:

2010-04-22T20:38:17+12:00 (14 years ago)

Author:

ak19

Message:

Fixed up win32.mak files in runtime-src that set DEFS for ANY of the indexers that can be ENABLEd/DISABLEd, such that DEFS for ALL the indexers are now set. Not doing so was causing memory overwrite problems (and consequently crashing) since different windows makefiles specified different indexers as specifically defined (leaving others unmentioned) whereas other makefiles would particularly pass on DEFS flags for all indexers. This made classes which were compiled which such makefiles and which contained references to these indexer objects a different size.

File:

• main/trunk/greenstone2/runtime-src/src/w32server/win32.mak (modified) (2 diffs)

main/trunk/greenstone2/runtime-src/src/w32server/win32.mak

@@ -73 +73 @@
 
 !IF $(ENABLE_MG)
+MG_DEFS = -DENABLE_MG
 MG_LIBS = "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \
     "$(INDEXERS_DIR)\mg\lib\libmglib.lib"
 MG_INCLUDES = -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text"
 !ELSE
+MG_DEFS = 
 MG_LIBS =
 MG_INCLUDES =
@@ -92 +94 @@
 !ENDIF
 
+!IF $(ENABLE_LUCENE)
+LUCENE_DEFS = -DENABLE_LUCENE
+!ELSE
+LUCENE_DEFS=
+!ENDIF
+
 AR = lib
 CC = cl
-DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_LITTLE_ENDIAN -DPARADOCNUM -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE $(MGPP_DEFS)
+DEFS = -D__WIN32__ -DHAVE_CONFIG_H -D_LITTLE_ENDIAN -DPARADOCNUM -DSHORT_SUFFIX -D_CRT_SECURE_NO_DEPRECATE \
+    $(MG_DEFS) $(MGPP_DEFS) $(LUCENE_DEFS)
 INCLUDES = -I"$(GSDL_DIR)" -I"$(COMMON_DIR)\src\lib" -I"$(COLSERVR_DIR)" -I"$(PROTOCOL_DIR)" -I"$(RECPT_DIR)" \
     -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3" -I"$(COMMON_PACKAGES_DIR)\gdbm\gdbm-1.8.3\windows" \