Changeset 21699 for main/trunk/gs2-core/runtime-src/src/colservr/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/colservr/win32.mak (modified) (4 diffs)

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

@@ -26 +26 @@
 
 
+GSDL_DIR = $(GSDLHOME)
+
+
 # Libraries compiled
 LIBRARIES = gsdlcolservr.lib
@@ -32 +35 @@
 # Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist!
 LIBCOLSERVR_CPPFLAGS = \
-    -I$(GSDLHOME)\common-src\src\lib
+    -I"$(GSDL_DIR)\common-src\src\lib"
 
 LIBCOLSERVR_OBJECTS = \
@@ -58 +61 @@
 # Option: Lucene support
 !IF $(ENABLE_LUCENE)
-LIBCOLSERVR_CPPFLAGS = -DENABLE_LUCENE $(LIBCOLSERVR_CPPFLAGS) -I"$(GSDLHOME)\common-src\packages\windows\expat\expat"
+LIBCOLSERVR_CPPFLAGS = -DENABLE_LUCENE $(LIBCOLSERVR_CPPFLAGS) -I"$(GSDL_DIR)\common-src\packages\windows\expat\expat"
 !ENDIF
 
 # Option: SQLite support
 !IF $(USE_SQLITE)
-LIBCOLSERVR_CPPFLAGS = -DUSE_SQLITE $(LIBCOLSERVR_CPPFLAGS) -I"$(GSDLHOME)\common-src\packages\sqlite\include"
+LIBCOLSERVR_CPPFLAGS = -DUSE_SQLITE $(LIBCOLSERVR_CPPFLAGS) -I"$(GSDL_DIR)\common-src\packages\sqlite\include"
 !ENDIF
 
 
 COMPILE = cl -nologo -c -EHsc -D__WIN32__ -DXML_STATIC -D_CRT_SECURE_NO_DEPRECATE $(LIBCOLSERVR_CPPFLAGS)
-LINK = cl -nologo -Fe"$@" 
+LINK = cl -nologo -Fe"$@"
 
 .SUFFIXES:
@@ -77 +80 @@
 
 
-gsdlcolservr.lib: $(LIBCOLSERVR_OBJECTS) 
+gsdlcolservr.lib: $(LIBCOLSERVR_OBJECTS)
     if EXIST gsdlcolservr.lib del gsdlcolservr.lib
     lib -nologo /out:gsdlcolservr.lib $(LIBCOLSERVR_OBJECTS)