Changeset 21366 for main/trunk/greenstone2/win32.mak

Timestamp:

2009-12-16T14:11:07+13:00 (14 years ago)

Author:

ak19

Message:

New configuration and compilation flag ENABLE_JNI added which will be disabled by default for GS2 since in general GS doesn't need mg and mgpp compiled up with jni. GS3's build.xml will need to explicitly set ENABLE_JNI to compile mg and mgpp with jni.

File:

• main/trunk/greenstone2/win32.mak (modified) (2 diffs)

main/trunk/greenstone2/win32.mak

@@ -40 +40 @@
 ENABLE_MGPP = 1
 ENABLE_LUCENE = 1
+# jni is disabled by default as this is the default for GS2
+ENABLE_JNI = 0
 
 
@@ -77 +79 @@
 !IF $(USE_Z3950)
 MAKECMD = $(MAKECMD) USE_Z3950=1
+!ENDIF
+!IF "$(ENABLE_JNI)" == ""
+MAKECMD = $(MAKECMD) ENABLE_JNI=0
+!ELSE
+MAKECMD = $(MAKECMD) ENABLE_JNI=$(ENABLE_JNI)
 !ENDIF
 !IF "$(ENABLE_MG)" == ""