Changeset 22824 for main/trunk/gs2-core/common-src/src/lib/Makefile.am

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/Makefile.am (modified) (3 diffs)

main/trunk/gs2-core/common-src/src/lib/Makefile.am

@@ -11 +11 @@
 
 COMMON_SRC_DIR = @top_srcdir@
+GSDL_DIR = $(COMMON_SRC_DIR)/..
 
 
@@ -19 +20 @@
 libgsdllib_a_CPPFLAGS = \
     $(COMPAT32BITFLAGS)
+
+# Option: SQLite support
+if USE_SQLITE
+  libgsdllib_a_CPPFLAGS += -I$(GSDL_DIR)/common-src/packages/sqlite/include
+endif
 
 # Sources for libgsdllib.a
@@ -41 +47 @@
 # Option: SQLite support
 if USE_SQLITE
-  libgsdllib_a_CPPFLAGS += -I$(COMMON_SRC_DIR)/packages/sqlite/include
   libgsdllib_a_SOURCES += sqlitedbclass.cpp
 endif