Changeset 22824 for main/trunk/gs2-core/common-src/src/lib/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/common-src/src/lib/win32.mak (modified) (3 diffs)

main/trunk/gs2-core/common-src/src/lib/win32.mak

@@ -10 +10 @@
 
 
-GSDL_DIR = $(GSDLHOME)
+COMMON_SRC_DIR = ..\..
+GSDL_DIR = $(COMMON_SRC_DIR)\..
 
 
 # Libraries compiled
-LIBRARIES = gsdllib.lib
+LIBRARIES = libgsdllib.lib
 
-# Library: gsdllib.lib
+# Library: libgsdllib.lib
 LIBGSDL_CPPFLAGS =
 
-# Objects for gsdllib.lib
+# Option: SQLite support (enabled by default)
+USE_SQLITE = 1
+!IF $(USE_SQLITE)
+LIBGSDL_CPPFLAGS = -DUSE_SQLITE $(LIBGSDL_CPPFLAGS) -I"$(GSDL_DIR)\common-src\packages\sqlite\include"
+!ENDIF
+
+# Objects for libgsdllib.lib
 LIBGSDL_OBJECTS = \
     cfgread.obj \
@@ -38 +45 @@
     unitool.obj
 
-
-# Option: SQLite support
+# Option: SQLite support (enabled by default)
+USE_SQLITE = 1
 !IF $(USE_SQLITE)
-LIBGSDL_CPPFLAGS = -DUSE_SQLITE $(LIBGSDL_CPPFLAGS) -I"$(GSDL_DIR)\common-src\packages\sqlite\include"
 LIBGSDL_OBJECTS = $(LIBGSDL_OBJECTS) sqlitedbclass.obj
 !ENDIF
@@ -56 +62 @@
 
 
-gsdllib.lib: $(LIBGSDL_OBJECTS) 
-    if EXIST gsdllib.lib del gsdllib.lib
-    lib -nologo /out:gsdllib.lib $(LIBGSDL_OBJECTS)
+libgsdllib.lib: $(LIBGSDL_OBJECTS) 
+    if EXIST libgsdllib.lib del libgsdllib.lib
+    lib -nologo /out:libgsdllib.lib $(LIBGSDL_OBJECTS)
 
 all: $(LIBRARIES)