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

Timestamp:

2010-09-01T10:36:46+12:00 (14 years ago)

Author:

mdewsnip

Message:

Lots of makefile tidy ups (both Windows and Linux), for consistency and flexibility.

File:

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

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

@@ -10 +10 @@
 
 
-GSDL_DIR = $(GSDLHOME)
+RUNTIME_SRC_DIR = ..\..
+GSDL_DIR = $(RUNTIME_SRC_DIR)\..
 
 
@@ -49 +50 @@
 
 OAISERVER_CGI_LDADD = \
-    "$(GSDL_DIR)\runtime-src\src\protocol\gsdlprotocol.lib" \
-    "$(GSDL_DIR)\runtime-src\src\colservr\gsdlcolservr.lib" \
-    "$(GSDL_DIR)\common-src\src\lib\gsdllib.lib"
+    "$(GSDL_DIR)\runtime-src\src\protocol\libgsdlprotocol.lib" \
+    "$(GSDL_DIR)\runtime-src\src\colservr\libgsdlcolservr.lib" \
+    "$(GSDL_DIR)\common-src\src\lib\libgsdllib.lib"
 
-
-# Option: Lucene support
+# Option: Lucene support (enabled by default)
+ENABLE_LUCENE = 1
 !IF $(ENABLE_LUCENE)
 OAISERVER_CGI_LDADD = $(OAISERVER_CGI_LDADD) "$(GSDL_DIR)\common-src\packages\expat\lib\libexpat.lib"
 !ENDIF
 
-# Option: SQLite support
+# Option: SQLite support (enabled by default)
+USE_SQLITE = 1
 !IF $(USE_SQLITE)
 OAISERVER_CGI_LDADD = $(OAISERVER_CGI_LDADD) "$(GSDL_DIR)\common-src\packages\sqlite\lib\sqlite3.lib"