Changeset 21436

Timestamp:

2010-01-07T14:49:03+13:00 (13 years ago)

Author:

ak19

Message:

Better way of setting the ENABLE_indexer and USE_SQLITE and ENABLE_JNI variables in the windows makefiles. This file now is the same as GS2's win32.mak.

File:

• main/trunk/gs2build/win32.mak (modified) (4 diffs)

main/trunk/gs2build/win32.mak

@@ -38 +38 @@
 USE_MSSQL = 0
 USE_Z3950 = 0
-
 # by default, all indexers are enabled
 ENABLE_MG = 1
@@ -53 +52 @@
 INSTALLDIRS = $(INSTALLDIRS) runtime-src 
 !ENDIF
+
 
 MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)"
@@ -74 +74 @@
 MAKECMD = $(MAKECMD) DLLDEBUG=1
 !ENDIF
-!IF "$(USE_SQLITE)" == ""
-MAKECMD = $(MAKECMD) USE_SQLITE=1
-!ELSE
-MAKECMD = $(MAKECMD) USE_SQLITE=$(USE_SQLITE)
+!IF !$(USE_SQLITE)
+MAKECMD = $(MAKECMD) USE_SQLITE=0
 !ENDIF
 !IF $(USE_MSSQL)
@@ -85 +83 @@
 MAKECMD = $(MAKECMD) USE_Z3950=1
 !ENDIF
-!IF "$(ENABLE_JNI)" == ""
-MAKECMD = $(MAKECMD) ENABLE_JNI=0
-!ELSE
-MAKECMD = $(MAKECMD) ENABLE_JNI=$(ENABLE_JNI)
+!IF $(ENABLE_JNI)
+MAKECMD = $(MAKECMD) ENABLE_JNI=1
 !ENDIF
-!IF "$(ENABLE_MG)" == ""
-MAKECMD = $(MAKECMD) ENABLE_MG=1
-!ELSE
-MAKECMD = $(MAKECMD) ENABLE_MG=$(ENABLE_MG)
+!IF !$(ENABLE_MG)
+MAKECMD = $(MAKECMD) ENABLE_MG=0
 !ENDIF
-!IF "$(ENABLE_MGPP)" == ""
-MAKECMD = $(MAKECMD) ENABLE_MGPP=1
-!ELSE
-MAKECMD = $(MAKECMD) ENABLE_MGPP=$(ENABLE_MGPP)
+!IF !$(ENABLE_MGPP)
+MAKECMD = $(MAKECMD) ENABLE_MGPP=0
 !ENDIF
-!IF "$(ENABLE_LUCENE)" == ""
-MAKECMD = $(MAKECMD) ENABLE_LUCENE=1
-!ELSE
-MAKECMD = $(MAKECMD) ENABLE_LUCENE=$(ENABLE_LUCENE)
+!IF !$(ENABLE_LUCENE)
+MAKECMD = $(MAKECMD) ENABLE_LUCENE=0
 !ENDIF