Changeset 21699


Ignore:
Timestamp:
2010-02-02T14:32:23+13:00 (12 years ago)
Author:
mdewsnip
Message:

Improvements to win32.mak files to always include paths in quotes.

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

Legend:

Unmodified
Added
Removed
  • main/trunk/gs2-core/common-src/src/lib/win32.mak

    r21689 r21699  
    2626
    2727
     28GSDL_DIR = $(GSDLHOME)
     29
     30
    2831# Libraries compiled
    2932LIBRARIES = gsdllib.lib
     
    3235LIBGSDL_CPPFLAGS =
    3336
     37# Objects for gsdllib.lib
    3438LIBGSDL_OBJECTS = \
    3539    cfgread.obj \
     
    5357# Option: SQLite support
    5458!IF $(USE_SQLITE)
    55 LIBGSDL_CPPFLAGS = -DUSE_SQLITE $(LIBGSDL_CPPFLAGS) -I"$(GSDLHOME)\common-src\packages\sqlite\include"
     59LIBGSDL_CPPFLAGS = -DUSE_SQLITE $(LIBGSDL_CPPFLAGS) -I"$(GSDL_DIR)\common-src\packages\sqlite\include"
    5660LIBGSDL_OBJECTS = $(LIBGSDL_OBJECTS) sqlitedbclass.obj
    5761!ENDIF
  • main/trunk/gs2-core/runtime-src/src/colservr/win32.mak

    r21692 r21699  
    2626
    2727
     28GSDL_DIR = $(GSDLHOME)
     29
     30
    2831# Libraries compiled
    2932LIBRARIES = gsdlcolservr.lib
     
    3235# Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist!
    3336LIBCOLSERVR_CPPFLAGS = \
    34     -I$(GSDLHOME)\common-src\src\lib
     37    -I"$(GSDL_DIR)\common-src\src\lib"
    3538
    3639LIBCOLSERVR_OBJECTS = \
     
    5861# Option: Lucene support
    5962!IF $(ENABLE_LUCENE)
    60 LIBCOLSERVR_CPPFLAGS = -DENABLE_LUCENE $(LIBCOLSERVR_CPPFLAGS) -I"$(GSDLHOME)\common-src\packages\windows\expat\expat"
     63LIBCOLSERVR_CPPFLAGS = -DENABLE_LUCENE $(LIBCOLSERVR_CPPFLAGS) -I"$(GSDL_DIR)\common-src\packages\windows\expat\expat"
    6164!ENDIF
    6265
    6366# Option: SQLite support
    6467!IF $(USE_SQLITE)
    65 LIBCOLSERVR_CPPFLAGS = -DUSE_SQLITE $(LIBCOLSERVR_CPPFLAGS) -I"$(GSDLHOME)\common-src\packages\sqlite\include"
     68LIBCOLSERVR_CPPFLAGS = -DUSE_SQLITE $(LIBCOLSERVR_CPPFLAGS) -I"$(GSDL_DIR)\common-src\packages\sqlite\include"
    6669!ENDIF
    6770
    6871
    6972COMPILE = cl -nologo -c -EHsc -D__WIN32__ -DXML_STATIC -D_CRT_SECURE_NO_DEPRECATE $(LIBCOLSERVR_CPPFLAGS)
    70 LINK = cl -nologo -Fe"$@" 
     73LINK = cl -nologo -Fe"$@"
    7174
    7275.SUFFIXES:
     
    7780
    7881
    79 gsdlcolservr.lib: $(LIBCOLSERVR_OBJECTS) 
     82gsdlcolservr.lib: $(LIBCOLSERVR_OBJECTS)
    8083    if EXIST gsdlcolservr.lib del gsdlcolservr.lib
    8184    lib -nologo /out:gsdlcolservr.lib $(LIBCOLSERVR_OBJECTS)
  • main/trunk/gs2-core/runtime-src/src/oaiservr/win32.mak

    r21697 r21699  
    2626
    2727
     28GSDL_DIR = $(GSDLHOME)
     29
     30
    2831# Programs compiled and their install directories
    29 CGIBIN_DIR = $(GSDLHOME)\cgi-bin
     32CGIBIN_DIR = "$(GSDL_DIR)\cgi-bin"
    3033CGIBIN_PROGRAMS = oaiserver.cgi
    3134
    3235# Program: oaiserver.cgi
    3336OAISERVER_CGI_CPPFLAGS = \
    34     -I$(GSDLHOME)\common-src\src\lib \
    35     -I$(GSDLHOME)\runtime-src\src\colservr \
    36     -I$(GSDLHOME)\runtime-src\src\protocol \
    37     -I$(GSDLHOME)\runtime-src\src\recpt
     37    -I"$(GSDL_DIR)\common-src\src\lib" \
     38    -I"$(GSDL_DIR)\runtime-src\src\colservr" \
     39    -I"$(GSDL_DIR)\runtime-src\src\protocol" \
     40    -I"$(GSDL_DIR)\runtime-src\src\recpt"
    3841
    3942# Objects for oaiserver.cgi
     
    5760    resumptiontoken.obj \
    5861    rfc1807.obj \
    59     $(GSDLHOME)\runtime-src\src\recpt\cgiargs.obj \
    60     $(GSDLHOME)\runtime-src\src\recpt\cgiutils.obj \
    61     $(GSDLHOME)\runtime-src\src\recpt\htmlutils.obj
     62    "$(GSDL_DIR)\runtime-src\src\recpt\cgiargs.obj" \
     63    "$(GSDL_DIR)\runtime-src\src\recpt\cgiutils.obj" \
     64    "$(GSDL_DIR)\runtime-src\src\recpt\htmlutils.obj"
    6265
    6366OAISERVER_CGI_LDADD = \
    64     $(GSDLHOME)\runtime-src\src\protocol\gsdlprotocol.lib \
    65     $(GSDLHOME)\runtime-src\src\colservr\gsdlcolservr.lib \
    66     $(GSDLHOME)\common-src\src\lib\gsdllib.lib
     67    "$(GSDL_DIR)\runtime-src\src\protocol\gsdlprotocol.lib" \
     68    "$(GSDL_DIR)\runtime-src\src\colservr\gsdlcolservr.lib" \
     69    "$(GSDL_DIR)\common-src\src\lib\gsdllib.lib"
    6770
    6871
    6972# Option: SQLite support
    7073!IF $(USE_SQLITE)
    71 OAISERVER_CGI_LDADD = $(OAISERVER_CGI_LDADD) $(GSDLHOME)\common-src\packages\sqlite\lib\sqlite3.lib
     74OAISERVER_CGI_LDADD = $(OAISERVER_CGI_LDADD) "$(GSDL_DIR)\common-src\packages\sqlite\lib\sqlite3.lib"
    7275!ENDIF
    7376
    7477
    7578COMPILE = cl -nologo -c -EHsc -D__WIN32__ -DXML_STATIC -D_CRT_SECURE_NO_DEPRECATE $(OAISERVER_CGI_CPPFLAGS)
    76 LINK = cl -nologo -Fe"$@" 
     79LINK = cl -nologo -Fe"$@"
    7780
    7881.SUFFIXES:
  • main/trunk/gs2-core/runtime-src/src/protocol/win32.mak

    r21693 r21699  
    2626
    2727
     28GSDL_DIR = $(GSDLHOME)
     29
     30
    2831# Libraries compiled
    2932LIBRARIES = gsdlprotocol.lib
     
    3235# Do NOT add the "recpt" directory here: the protocol should be independent of the receptionist!
    3336LIBPROTOCOL_CPPFLAGS = \
    34     -I$(GSDLHOME)\common-src\src\lib \
    35     -I$(GSDLHOME)\runtime-src\src\colservr
     37    -I"$(GSDL_DIR)\common-src\src\lib" \
     38    -I"$(GSDL_DIR)\runtime-src\src\colservr"
    3639
    3740LIBPROTOCOL_OBJECTS = \
  • main/trunk/gs2-core/runtime-src/src/recpt/win32.mak

    r21695 r21699  
    2626
    2727
     28GSDL_DIR = $(GSDLHOME)
     29
     30
    2831# Programs compiled and their install directories
    29 CGIBIN_DIR = $(GSDLHOME)\cgi-bin
     32CGIBIN_DIR = "$(GSDL_DIR)\cgi-bin"
    3033CGIBIN_PROGRAMS = library.cgi
    3134
    3235# Program: library.cgi
    3336LIBRARY_CGI_CPPFLAGS = \
    34     -I$(GSDLHOME)\common-src\src\lib \
    35     -I$(GSDLHOME)\runtime-src\src\colservr \
    36     -I$(GSDLHOME)\runtime-src\src\protocol \
    37     -I$(GSDLHOME)\common-src\packages\windows\crypt\crypt
     37    -I"$(GSDL_DIR)\common-src\src\lib" \
     38    -I"$(GSDL_DIR)\runtime-src\src\colservr" \
     39    -I"$(GSDL_DIR)\runtime-src\src\protocol" \
     40    -I"$(GSDL_DIR)\common-src\packages\windows\crypt\crypt"
    3841
    3942# Objects for library.cgi
     
    8588
    8689LIBRARY_CGI_LDADD = \
    87     $(GSDLHOME)\runtime-src\src\protocol\gsdlprotocol.lib \
    88     $(GSDLHOME)\runtime-src\src\colservr\gsdlcolservr.lib \
    89     $(GSDLHOME)\common-src\src\lib\gsdllib.lib \
    90     $(GSDLHOME)\common-src\packages\windows\crypt\crypt\crypt.lib
     90    "$(GSDL_DIR)\runtime-src\src\protocol\gsdlprotocol.lib" \
     91    "$(GSDL_DIR)\runtime-src\src\colservr\gsdlcolservr.lib" \
     92    "$(GSDL_DIR)\common-src\src\lib\gsdllib.lib" \
     93    "$(GSDL_DIR)\common-src\packages\windows\crypt\crypt\crypt.lib"
    9194
    9295
    9396# Option: SQLite support
    9497!IF $(USE_SQLITE)
    95 LIBRARY_CGI_LDADD = $(LIBRARY_CGI_LDADD) $(GSDLHOME)\common-src\packages\sqlite\lib\sqlite3.lib
     98LIBRARY_CGI_LDADD = $(LIBRARY_CGI_LDADD) "$(GSDL_DIR)\common-src\packages\sqlite\lib\sqlite3.lib"
    9699!ENDIF
    97100
Note: See TracChangeset for help on using the changeset viewer.