Changeset 21699 for main/trunk/gs2-core/runtime-src/src/oaiservr/win32.mak

Timestamp:

2010-02-02T14:32:23+13:00 (14 years ago)

Author:

mdewsnip

Message:

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

File:

• main/trunk/gs2-core/runtime-src/src/oaiservr/win32.mak (modified) (2 diffs)

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

@@ -26 +26 @@
 
 
+GSDL_DIR = $(GSDLHOME)
+
+
 # Programs compiled and their install directories
-CGIBIN_DIR = $(GSDLHOME)\cgi-bin
+CGIBIN_DIR = "$(GSDL_DIR)\cgi-bin"
 CGIBIN_PROGRAMS = oaiserver.cgi
 
 # Program: oaiserver.cgi
 OAISERVER_CGI_CPPFLAGS = \
-    -I$(GSDLHOME)\common-src\src\lib \
-    -I$(GSDLHOME)\runtime-src\src\colservr \
-    -I$(GSDLHOME)\runtime-src\src\protocol \
-    -I$(GSDLHOME)\runtime-src\src\recpt
+    -I"$(GSDL_DIR)\common-src\src\lib" \
+    -I"$(GSDL_DIR)\runtime-src\src\colservr" \
+    -I"$(GSDL_DIR)\runtime-src\src\protocol" \
+    -I"$(GSDL_DIR)\runtime-src\src\recpt"
 
 # Objects for oaiserver.cgi
@@ -57 +60 @@
     resumptiontoken.obj \
     rfc1807.obj \
-    $(GSDLHOME)\runtime-src\src\recpt\cgiargs.obj \
-    $(GSDLHOME)\runtime-src\src\recpt\cgiutils.obj \
-    $(GSDLHOME)\runtime-src\src\recpt\htmlutils.obj
+    "$(GSDL_DIR)\runtime-src\src\recpt\cgiargs.obj" \
+    "$(GSDL_DIR)\runtime-src\src\recpt\cgiutils.obj" \
+    "$(GSDL_DIR)\runtime-src\src\recpt\htmlutils.obj"
 
 OAISERVER_CGI_LDADD = \
-    $(GSDLHOME)\runtime-src\src\protocol\gsdlprotocol.lib \
-    $(GSDLHOME)\runtime-src\src\colservr\gsdlcolservr.lib \
-    $(GSDLHOME)\common-src\src\lib\gsdllib.lib
+    "$(GSDL_DIR)\runtime-src\src\protocol\gsdlprotocol.lib" \
+    "$(GSDL_DIR)\runtime-src\src\colservr\gsdlcolservr.lib" \
+    "$(GSDL_DIR)\common-src\src\lib\gsdllib.lib"
 
 
 # Option: SQLite support
 !IF $(USE_SQLITE)
-OAISERVER_CGI_LDADD = $(OAISERVER_CGI_LDADD) $(GSDLHOME)\common-src\packages\sqlite\lib\sqlite3.lib
+OAISERVER_CGI_LDADD = $(OAISERVER_CGI_LDADD) "$(GSDL_DIR)\common-src\packages\sqlite\lib\sqlite3.lib"
 !ENDIF
 
 
 COMPILE = cl -nologo -c -EHsc -D__WIN32__ -DXML_STATIC -D_CRT_SECURE_NO_DEPRECATE $(OAISERVER_CGI_CPPFLAGS)
-LINK = cl -nologo -Fe"$@" 
+LINK = cl -nologo -Fe"$@"
 
 .SUFFIXES: