Changeset 15624

Show
Ignore:
Timestamp:
22.05.2008 10:48:13 (12 years ago)
Author:
kjdon
Message:

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

Location:
indexers/trunk/mgpp
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • indexers/trunk/mgpp/jni/win32.mak

    r14502 r15624  
    2727MGPPHOME = .. 
    2828 
     29UNAC_DIR = ../../packages/unac 
     30 
     31ENABLE_ACCENTFOLD = 1 
     32 
     33!IF $(ENABLE_ACCENTFOLD) 
     34AFLIBS = "$(UNAC_DIR)\libunac.lib"  "$(UNAC_DIR)\iconv.lib" 
     35AFINCLUDES = -I"$(UNAC_DIR)" 
     36!ELSE 
     37AFLIBS =  
     38AFINCLUDES =  
     39!ENDIF 
     40 
    2941AR = lib 
    3042CC = cl 
     
    3345DEFS = -DQUIET -DHAVE_CONFIG_H -DSHORT_SUFFIX -DHAVE_STRING_H -D__WIN32__ 
    3446INCLUDES = -I"$(MGPPHOME)" -I"$(MGPPHOME)\lib" -I"$(MGPPHOME)\text" \ 
    35            -I"$(JAVA_HOME)\include" -I"$(JAVA_HOME)\include\win32"            
     47           -I"$(JAVA_HOME)\include" -I"$(JAVA_HOME)\include\win32" $(AFINCLUDES)            
    3648 
    3749COMPILE = $(CC) -c $(CPPFLAGS) $(DEFS) $(INCLUDES)  
     
    5466RETRIEVEOBJECTS = \ 
    5567    MGPPRetrieveWrapperImpl$o  $(MGPPHOME)\text\libmgpptext.lib \ 
    56     $(MGPPHOME)\lib\libmgpplib.lib 
     68    $(MGPPHOME)\lib\libmgpplib.lib  
    5769 
    5870SEARCHOBJETCS =  \ 
    5971    MGPPSearchWrapperImpl$o $(MGPPHOME)\text\libmgpptext.lib \ 
    60     $(MGPPHOME)\lib\libmgpplib.lib 
    61  
     72    $(MGPPHOME)\lib\libmgpplib.lib $(AFLIBS) 
    6273 
    6374PASSES_OBJECTS = \ 
  • indexers/trunk/mgpp/text/win32.mak

    r14908 r15624  
    2626 
    2727MGPPHOME = .. 
     28 
     29UNAC_DIR = ../../packages/unac 
     30 
     31ENABLE_ACCENTFOLD = 1 
     32 
     33!IF $(ENABLE_ACCENTFOLD) 
     34AFLIBS = "$(UNAC_DIR)\libunac.lib"  "$(UNAC_DIR)\iconv.lib" 
     35AFINCLUDES = -I"$(UNAC_DIR)" 
     36AFDEFS = -DENABLE_ACCENTFOLD 
     37!ELSE 
     38AFLIBS =  
     39AFINCLUDES =  
     40AFDEFS =  
     41!ENDIF 
     42 
    2843# for now put executables in indexers/bin 
    2944INSTALLDIR = ..\..\bin 
     
    3348LINK = cl 
    3449 
    35 DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -DSHORT_SUFFIX -D__STDC__ -D__GNU_LIBRARY__ -D__MSDOS__ 
    36 INCLUDES = -I"." -I"$(MGPPHOME)" -I"$(MGPPHOME)\lib" 
    37 LIBS = $(MGPPHOME)\lib\libmgpplib.lib 
     50DEFS = -DQUIET -DHAVE_CONFIG_H -D__WIN32__ -DSHORT_SUFFIX -D__STDC__ -D__GNU_LIBRARY__ -D__MSDOS__ $(AFDEFS) 
     51INCLUDES = -I"." -I"$(MGPPHOME)" -I"$(MGPPHOME)\lib" $(AFINCLUDES) 
     52LIBS = $(MGPPHOME)\lib\libmgpplib.lib $(AFLIBS)  
    3853 
    3954COMPILE = $(CC) -c  $(CPPFLAGS) $(DEFS) $(INCLUDES)