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.

Location:
main/trunk/greenstone2/common-src
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r21325 r21435  
    6868!ENDIF
    6969
    70 !IF "$(USE_SQLITE)" == "0"
     70!IF $(USE_SQLITE)
     71SQLITE_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\sqlite\include"
     72SQLITE_OBJECTS = sqlitedbclass.obj
     73SQLITE_SOURCES = sqlitedbclass.cpp
     74!ELSE
    7175SQLITE_INCLUDES =
    7276SQLITE_OBJECTS =
    7377SQLITE_SOURCES =
    74 !ELSE
    75 SQLITE_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\sqlite\include"
    76 SQLITE_OBJECTS = sqlitedbclass.obj
    77 SQLITE_SOURCES = sqlitedbclass.cpp
    7878!ENDIF
    7979

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

    r21365 r21435  
    3737USE_SQLITE = 1
    3838USE_MSSQL = 0
     39# by default, all indexers are enabled
     40ENABLE_MG = 1
     41ENABLE_MGPP = 1
     42ENABLE_LUCENE = 1
     43# jni is disabled by default as this is the default for GS2. GS3 will set this explicitly
     44ENABLE_JNI = 0
    3945
    4046MDEFINES = /f win32.mak
    … …  
    5561SQLITE_DIR = packages\sqlite\sqlite-amalgamation-3.5.9
    5662
    57 # indexers requires the ENABLE_indexer flags to be either 1 or 0,
    58 # so we ensure this is the case here
    59 !IF "$(ENABLE_MG)" != "0"
    60 ENABLE_MG = 1
    61 !ENDIF
    62 !IF "$(ENABLE_MGPP)" != "0"
    63 ENABLE_MGPP = 1
    64 !ENDIF
    65 !IF "$(ENABLE_LUCENE)" != "0"
    66 ENABLE_LUCENE = 1
    67 !ENDIF
    6863
    6964MAKECMD = $(MAKE) $(MDEFINES) GSDLHOME="$(GSDLHOME)" BINDIR="$(GSDLHOME)\bin\windows"
    … …  
    8176MAKECMD = $(MAKECMD) DLLDEBUG=1
    8277!ENDIF
    83 !IF "$(USE_SQLITE)" == "0"
     78!IF $(USE_SQLITE)
     79PACKAGEDIRS = $(PACKAGEDIRS) $(SQLITE_DIR)
     80!ELSE
    8481MAKECMD = $(MAKECMD) USE_SQLITE=0
    85 !ELSE
    86 MAKECMD = $(MAKECMD) USE_SQLITE=1
    87 PACKAGEDIRS = $(PACKAGEDIRS) $(SQLITE_DIR)
    8882!ENDIF
    8983!IF $(USE_MSSQL)
    … …  
    192186    set ENABLE_LUCENE=$(ENABLE_LUCENE)
    193187
    194 !IF "$(ENABLE_JNI)" == "1"
     188!IF $(ENABLE_JNI)
    195189    call winMake.bat all with-jni
    196190    call winMake.bat install with-jni
Note: See TracChangeset for help on using the changeset viewer.