Changeset 22824 for main/trunk/gs2-core/common-src
- Timestamp:
- 2010-09-01T10:36:46+12:00 (14 years ago)
- Location:
- main/trunk/gs2-core/common-src
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/gs2-core/common-src/src/lib/Makefile.am
r22795 r22824 11 11 12 12 COMMON_SRC_DIR = @top_srcdir@ 13 GSDL_DIR = $(COMMON_SRC_DIR)/.. 13 14 14 15 … … 19 20 libgsdllib_a_CPPFLAGS = \ 20 21 $(COMPAT32BITFLAGS) 22 23 # Option: SQLite support 24 if USE_SQLITE 25 libgsdllib_a_CPPFLAGS += -I$(GSDL_DIR)/common-src/packages/sqlite/include 26 endif 21 27 22 28 # Sources for libgsdllib.a … … 41 47 # Option: SQLite support 42 48 if USE_SQLITE 43 libgsdllib_a_CPPFLAGS += -I$(COMMON_SRC_DIR)/packages/sqlite/include44 49 libgsdllib_a_SOURCES += sqlitedbclass.cpp 45 50 endif -
main/trunk/gs2-core/common-src/src/lib/Makefile.in
r22795 r22824 49 49 50 50 # Option: SQLite support 51 @USE_SQLITE_TRUE@am__append_1 = -I$(COMMON_SRC_DIR)/packages/sqlite/include 51 @USE_SQLITE_TRUE@am__append_1 = -I$(GSDL_DIR)/common-src/packages/sqlite/include 52 53 # Option: SQLite support 52 54 @USE_SQLITE_TRUE@am__append_2 = sqlitedbclass.cpp 53 55 subdir = src/lib … … 183 185 target_alias = @target_alias@ 184 186 COMMON_SRC_DIR = @top_srcdir@ 187 GSDL_DIR = $(COMMON_SRC_DIR)/.. 185 188 186 189 # Libraries compiled -
main/trunk/gs2-core/common-src/src/lib/win32.mak
r22795 r22824 10 10 11 11 12 GSDL_DIR = $(GSDLHOME) 12 COMMON_SRC_DIR = ..\.. 13 GSDL_DIR = $(COMMON_SRC_DIR)\.. 13 14 14 15 15 16 # Libraries compiled 16 LIBRARIES = gsdllib.lib17 LIBRARIES = libgsdllib.lib 17 18 18 # Library: gsdllib.lib19 # Library: libgsdllib.lib 19 20 LIBGSDL_CPPFLAGS = 20 21 21 # Objects for gsdllib.lib 22 # Option: SQLite support (enabled by default) 23 USE_SQLITE = 1 24 !IF $(USE_SQLITE) 25 LIBGSDL_CPPFLAGS = -DUSE_SQLITE $(LIBGSDL_CPPFLAGS) -I"$(GSDL_DIR)\common-src\packages\sqlite\include" 26 !ENDIF 27 28 # Objects for libgsdllib.lib 22 29 LIBGSDL_OBJECTS = \ 23 30 cfgread.obj \ … … 38 45 unitool.obj 39 46 40 41 # Option: SQLite support 47 # Option: SQLite support (enabled by default) 48 USE_SQLITE = 1 42 49 !IF $(USE_SQLITE) 43 LIBGSDL_CPPFLAGS = -DUSE_SQLITE $(LIBGSDL_CPPFLAGS) -I"$(GSDL_DIR)\common-src\packages\sqlite\include"44 50 LIBGSDL_OBJECTS = $(LIBGSDL_OBJECTS) sqlitedbclass.obj 45 51 !ENDIF … … 56 62 57 63 58 gsdllib.lib: $(LIBGSDL_OBJECTS)59 if EXIST gsdllib.lib delgsdllib.lib60 lib -nologo /out: gsdllib.lib $(LIBGSDL_OBJECTS)64 libgsdllib.lib: $(LIBGSDL_OBJECTS) 65 if EXIST libgsdllib.lib del libgsdllib.lib 66 lib -nologo /out:libgsdllib.lib $(LIBGSDL_OBJECTS) 61 67 62 68 all: $(LIBRARIES) -
main/trunk/gs2-core/common-src/win32.mak
r22763 r22824 10 10 11 11 12 # Option: Lucene support 12 # Option: Lucene support (enabled by default) 13 ENABLE_LUCENE = 1 13 14 !IF $(ENABLE_LUCENE) 14 15 LUCENE_SUBDIRS = indexers packages\expat 15 16 !ENDIF 16 17 17 # Option: SQLite support 18 # Option: SQLite support (enabled by default) 19 USE_SQLITE = 1 18 20 !IF $(USE_SQLITE) 19 21 SQLITE_SUBDIRS = packages\sqlite
Note:
See TracChangeset
for help on using the changeset viewer.