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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • 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:
Note: See TracChangeset for help on using the changeset viewer.