Changeset 22763


Ignore:
Timestamp:
2010-08-24T16:28:59+12:00 (14 years ago)
Author:
mdewsnip
Message:

Changed Windows gs2-core makefiles to compile and use Expat from common-src/packages/expat instead of common-src/packages/windows/expat/expat.

Location:
main/trunk/gs2-core
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • main/trunk/gs2-core/common-src/win32.mak

    r22728 r22763  
    1212# Option: Lucene support
    1313!IF $(ENABLE_LUCENE)
    14 LUCENE_SUBDIRS = indexers packages\windows\expat\expat
     14LUCENE_SUBDIRS = indexers packages\expat
    1515!ENDIF
    1616

  • main/trunk/gs2-core/runtime-src/src/colservr/win32.mak

    r22758 r22763  
    4545# Option: Lucene support
    4646!IF $(ENABLE_LUCENE)
    47 LIBCOLSERVR_CPPFLAGS = -DENABLE_LUCENE $(LIBCOLSERVR_CPPFLAGS) -I"$(GSDL_DIR)\common-src\packages\windows\expat\expat"
     47LIBCOLSERVR_CPPFLAGS = -DENABLE_LUCENE $(LIBCOLSERVR_CPPFLAGS) -I"$(GSDL_DIR)\common-src\packages\expat\include"
    4848LIBCOLSERVR_OBJECTS = $(LIBCOLSERVR_OBJECTS) expat_document.obj expat_resultset.obj
    4949!ENDIF

  • main/trunk/gs2-core/runtime-src/src/oaiservr/win32.mak

    r22740 r22763  
    5656# Option: Lucene support
    5757!IF $(ENABLE_LUCENE)
    58 OAISERVER_CGI_LDADD = $(OAISERVER_CGI_LDADD) "$(GSDL_DIR)\common-src\packages\windows\expat\expat\libexpat.lib"
     58OAISERVER_CGI_LDADD = $(OAISERVER_CGI_LDADD) "$(GSDL_DIR)\common-src\packages\expat\lib\libexpat.lib"
    5959!ENDIF
    6060

  • main/trunk/gs2-core/runtime-src/src/recpt/win32.mak

    r22757 r22763  
    8282!IF $(ENABLE_LUCENE)
    8383LIBRARY_CGI_CPPFLAGS = -DENABLE_LUCENE $(LIBRARY_CGI_CPPFLAGS)
    84 LIBRARY_CGI_LDADD = $(LIBRARY_CGI_LDADD) "$(GSDL_DIR)\common-src\packages\windows\expat\expat\libexpat.lib"
     84LIBRARY_CGI_LDADD = $(LIBRARY_CGI_LDADD) "$(GSDL_DIR)\common-src\packages\expat\lib\libexpat.lib"
    8585!ENDIF
    8686
Note: See TracChangeset for help on using the changeset viewer.