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

Timestamp:

2009-12-16T14:10:51+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/common-src/win32.mak (modified) (1 diff)

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

@@ -192 +192 @@
     set ENABLE_LUCENE=$(ENABLE_LUCENE)
 
-    if EXIST "$(GSDLHOME)\runtime-src" call winMake.bat all gs2
-    if EXIST "$(GSDLHOME)\runtime-src" call winMake.bat install gs2
-    if NOT EXIST "$(GSDLHOME)\runtime-src" call winMake.bat all
-    if NOT EXIST "$(GSDLHOME)\runtime-src" call winMake.bat install
+!IF "$(ENABLE_JNI)" == "1"
+    call winMake.bat all with-jni
+    call winMake.bat install with-jni
+!ELSE
+    call winMake.bat all without-jni
+    call winMake.bat install without-jni
+!ENDIF
 
     set DEBUG=