Show
Ignore:
Timestamp:
07.01.2010 14:23:27 (10 years ago)
Author:
ak19
Message:

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

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/src/colservr/win32.mak

    r21324 r21435  
    6464!ENDIF 
    6565 
    66 !IF "$(USE_SQLITE)" == "0" 
     66!IF $(USE_SQLITE) 
     67SQLITE_DEFINES = -DUSE_SQLITE 
     68SQLITE_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\sqlite\include" 
     69!ELSE 
    6770SQLITE_DEFINES =  
    6871SQLITE_INCLUDES =  
    69 !ELSE 
    70 SQLITE_DEFINES = -DUSE_SQLITE 
    71 SQLITE_INCLUDES = -I"$(COMMON_PACKAGES_DIR)\sqlite\include" 
    7272!ENDIF 
    7373 
     
    7878!ENDIF 
    7979 
    80 !IF "$(ENABLE_MG)" == "0" 
    81 MG_DEFS = 
    82 MG_SOURCES = 
    83 MG_OBJECTS = 
    84 MG_INCLUDES = 
    85 !ELSE 
     80!IF $(ENABLE_MG) 
    8681MG_DEFS = -DENABLE_MG 
    8782MG_SOURCES = mgq.c \ 
     
    9691    mgsource.obj 
    9792MG_INCLUDES = -I"$(INDEXERS_DIR)\mg" -I"$(INDEXERS_DIR)\mg\lib" -I"$(INDEXERS_DIR)\mg\src\text" 
    98 !ENDIF 
    99  
    100 !IF "$(ENABLE_MGPP)" == "0" 
    101 MGPP_DEFS = 
    102 MGPP_SOURCES = 
    103 MGPP_OBJECTS = 
    104 MGPP_INCLUDES = 
    105 !ELSE 
     93!ELSE 
     94MG_DEFS = 
     95MG_SOURCES = 
     96MG_OBJECTS = 
     97MG_INCLUDES = 
     98!ENDIF 
     99 
     100!IF $(ENABLE_MGPP) 
    106101MGPP_DEFS = -DENABLE_MGPP 
    107102MGPP_SOURCES = mgppqueryfilter.cpp \ 
     
    112107    mgppsource.obj 
    113108MGPP_INCLUDES = -I"$(INDEXERS_DIR)\mgpp\lib" -I"$(INDEXERS_DIR)\mgpp\text" 
     109!ELSE 
     110MGPP_DEFS = 
     111MGPP_SOURCES = 
     112MGPP_OBJECTS = 
     113MGPP_INCLUDES = 
    114114!ENDIF 
    115115