Show
Ignore:
Timestamp:
24.08.2010 16:58:15 (10 years ago)
Author:
mdewsnip
Message:

Instead of having two copies of expat in Greenstone (one for Linux and one for Windows), added Windows makefiles into the version in common-src/packages/expat. This means we can remove the Windows-only version in common-src/packages/windows/expat, and also means that expat now works the same as SQLite.

Files:
1 modified

Legend:

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

    r22090 r22766  
    143143        $(MGPP_INCLUDES) -I"$(COMMON_PACKAGES_DIR)\windows\crypt\crypt" \ 
    144144    $(GDBM_INCLUDES) \ 
    145     -I"$(COMMON_PACKAGES_DIR)\windows\expat\expat" 
     145    -I"$(COMMON_PACKAGES_DIR)\expat\include" 
    146146LDFLAGS =  
    147 LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\windows\expat\expat\libexpat.lib" \ 
     147LIBS = "$(COMMON_PACKAGES_DIR)\windows\crypt\crypt\crypt.lib" "$(COMMON_PACKAGES_DIR)\expat\lib\libexpat.lib" \ 
    148148        $(GDBM_LIBS) $(ACCENTFOLD_LIBS) $(SQLITE_LIBS) 
    149149