Changeset 15624 for indexers/trunk/mgpp/jni/win32.mak

Timestamp:

2008-05-22T10:48:13+12:00 (16 years ago)

Author:

kjdon

Message:

accent folding options were lost for windows makefiles, so adding them back in

File:

• indexers/trunk/mgpp/jni/win32.mak (modified) (3 diffs)

indexers/trunk/mgpp/jni/win32.mak

@@ -27 +27 @@
 MGPPHOME = ..
 
+UNAC_DIR = ../../packages/unac
+
+ENABLE_ACCENTFOLD = 1
+
+!IF $(ENABLE_ACCENTFOLD)
+AFLIBS = "$(UNAC_DIR)\libunac.lib"  "$(UNAC_DIR)\iconv.lib"
+AFINCLUDES = -I"$(UNAC_DIR)"
+!ELSE
+AFLIBS = 
+AFINCLUDES = 
+!ENDIF
+
 AR = lib
 CC = cl
@@ -33 +45 @@
 DEFS = -DQUIET -DHAVE_CONFIG_H -DSHORT_SUFFIX -DHAVE_STRING_H -D__WIN32__
 INCLUDES = -I"$(MGPPHOME)" -I"$(MGPPHOME)\lib" -I"$(MGPPHOME)\text" \
-           -I"$(JAVA_HOME)\include" -I"$(JAVA_HOME)\include\win32"           
+           -I"$(JAVA_HOME)\include" -I"$(JAVA_HOME)\include\win32" $(AFINCLUDES)           
 
 COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES) 
@@ -54 +66 @@
 RETRIEVEOBJECTS = \
     MGPPRetrieveWrapperImpl$o  $(MGPPHOME)\text\libmgpptext.lib \
-    $(MGPPHOME)\lib\libmgpplib.lib
+    $(MGPPHOME)\lib\libmgpplib.lib 
 
 SEARCHOBJETCS =  \
     MGPPSearchWrapperImpl$o $(MGPPHOME)\text\libmgpptext.lib \
-    $(MGPPHOME)\lib\libmgpplib.lib
-
+    $(MGPPHOME)\lib\libmgpplib.lib $(AFLIBS)
 
 PASSES_OBJECTS = \