Changeset 21435 for main/trunk/greenstone2/runtime-src/src/recpt/win32.mak

Timestamp:

2010-01-07T14:23:27+13:00 (14 years ago)

Author:

ak19

Message:

Better way of setting the ENABLE_indexer and USE_SQLITE and ENABLE_JNI variables in the windows makefiles.

File:

• main/trunk/greenstone2/runtime-src/src/recpt/win32.mak (modified) (3 diffs)

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

@@ -75 +75 @@
 !ENDIF
 
-!IF "$(USE_SQLITE)" == "0"
+!IF $(USE_SQLITE)
+SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
+!ELSE
 SQLITE_LIBS = 
-!ELSE
-SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
 !ENDIF
 
@@ -91 +91 @@
 !ENDIF
 
-!IF "$(ENABLE_MG)" == "0"
-MG_DEFS =
-MG_LIBS =
-MG_INCLUDES =
-!ELSE
+!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" 
-!ENDIF
-
-!IF "$(ENABLE_MGPP)" == "0"
-MGPP_DEFS =
-MGPP_SOURCES = 
-MGPP_OBJECTS = 
-MGPP_LIBS =
-MGPP_INCLUDES =
-!ELSE
+!ELSE
+MG_DEFS =
+MG_LIBS =
+MG_INCLUDES =
+!ENDIF
+
+!IF $(ENABLE_MGPP)
 MGPP_DEFS = -DENABLE_MGPP
 MGPP_SOURCES = phindaction.cpp
@@ -116 +110 @@
 MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\text" \
     -I"$(INDEXERS_DIR)\mgpp\lib"
+!ELSE
+MGPP_DEFS =
+MGPP_SOURCES = 
+MGPP_OBJECTS = 
+MGPP_LIBS =
+MGPP_INCLUDES =
 !ENDIF