Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed

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

    r21324 r21435  
    6666!ENDIF
    6767
    68 !IF "$(USE_SQLITE)" == "0"
     68!IF $(USE_SQLITE)
     69SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
     70!ELSE
    6971SQLITE_LIBS =
    70 !ELSE
    71 SQLITE_LIBS = "$(COMMON_PACKAGES_DIR)\sqlite\lib\sqlite3.lib"
    72 !ENDIF
    73 
    74 !IF "$(ENABLE_MG)" == "0"
    75 MG_LIBS =
    76 MG_INCLUDES =
    77 !ELSE
     72!ENDIF
     73
     74!IF $(ENABLE_MG)
    7875MG_LIBS = "$(INDEXERS_DIR)\mg\src\text\libmgtext.lib" \
    7976    "$(INDEXERS_DIR)\mg\lib\libmglib.lib"
    8077MG_INCLUDES = -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text"
    81 !ENDIF
    82 
    83 !IF "$(ENABLE_MGPP)" == "0"
    84 MGPP_DEFS =
    85 MGPP_LIBS =
    86 MGPP_INCLUDES =
    87 !ELSE
     78!ELSE
     79MG_LIBS =
     80MG_INCLUDES =
     81!ENDIF
     82
     83!IF $(ENABLE_MGPP)
    8884MGPP_DEFS = -DENABLE_MGPP
    8985MGPP_LIBS = "$(INDEXERS_DIR)\mgpp\text\libmgpptext.lib" \
    9086    "$(INDEXERS_DIR)\mgpp\lib\libmgpplib.lib"
    9187MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text"
     88!ELSE
     89MGPP_DEFS =
     90MGPP_LIBS =
     91MGPP_INCLUDES =
    9292!ENDIF
    9393
Note: See TracChangeset for help on using the changeset viewer.