Changeset 21692 for main/trunk/gs2-core/runtime-src/src

Timestamp:

2010-01-29T16:08:24+13:00 (14 years ago)

Author:

mdewsnip

Message:

Added Windows makefiles for runtime-src and runtime-src/src/colservr directories. Also added expat include path to runtime-src/src/colservr/Makefile.am if Lucene is enabled.

Location:

main/trunk/gs2-core/runtime-src/src/colservr

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (2 diffs)
• win32.mak (added)

main/trunk/gs2-core/runtime-src/src/colservr/Makefile.am

@@ -61 +61 @@
     sqlbrowsefilter.cpp
 
+# Option: Lucene support
+if ENABLE_LUCENE
+  libgsdlcolservr_a_CPPFLAGS += -I$(GSDL_DIR)/common-src/packages/expat/include
+endif
+
 # Option: SQLite support
 if USE_SQLITE

main/trunk/gs2-core/runtime-src/src/colservr/Makefile.in

@@ -64 +64 @@
 host_triplet = @host@
 
+# Option: Lucene support
+@ENABLE_LUCENE_TRUE@am__append_1 = -I$(GSDL_DIR)/common-src/packages/expat/include
+
 # Option: SQLite support
-@USE_SQLITE_TRUE@am__append_1 = -I$(GSDL_DIR)/common-src/packages/sqlite/include
+@USE_SQLITE_TRUE@am__append_2 = -I$(GSDL_DIR)/common-src/packages/sqlite/include
 subdir = src/colservr
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
@@ -213 +216 @@
 # Do NOT add the "recpt" directory here: the colserver should be independent of the receptionist!
 libgsdlcolservr_a_CPPFLAGS = -I$(GSDL_DIR)/common-src/src/lib \
-    $(COMPAT32BITFLAGS) $(am__append_1)
+    $(COMPAT32BITFLAGS) $(am__append_1) $(am__append_2)
 
 # Sources for libgsdlcolservr.a