aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-08-07 09:02:29 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-08-07 09:02:29 +0200
commitfaeb51bca04b658c5473bdd7a8f71f8a70113118 (patch)
treea556c9cd8ef2b04324b5f5cbd6fb4777882e339a
parent35d869be3529a043f3bc5444f1503f408474896c (diff)
Minor config file restructuring in preparation for build2 support
-rw-r--r--odb/sqlite/details/config-vc.h6
-rw-r--r--odb/sqlite/details/config.hxx11
-rw-r--r--odb/sqlite/makefile2
3 files changed, 14 insertions, 5 deletions
diff --git a/odb/sqlite/details/config-vc.h b/odb/sqlite/details/config-vc.h
new file mode 100644
index 0000000..2ecc24a
--- /dev/null
+++ b/odb/sqlite/details/config-vc.h
@@ -0,0 +1,6 @@
+/* file : odb/sqlite/details/config-vc.h
+ * copyright : Copyright (c) 2009-2015 Code Synthesis Tools CC
+ * license : GNU GPL v2; see accompanying LICENSE file
+ */
+
+/* Dummy configuration file for Windows/VC++. */
diff --git a/odb/sqlite/details/config.hxx b/odb/sqlite/details/config.hxx
index 5d19aad..ec89ed6 100644
--- a/odb/sqlite/details/config.hxx
+++ b/odb/sqlite/details/config.hxx
@@ -7,11 +7,14 @@
// no pre
-#ifdef _MSC_VER
-#elif defined(ODB_COMPILER)
+#ifdef ODB_COMPILER
# error libodb-sqlite header included in odb-compiled header
-#else
-# include <odb/sqlite/details/config.h>
+#elif !defined(LIBODB_SQLITE_BUILD2)
+# elif defined(_MSC_VER)
+# include <odb/details/config-vc.h>
+# else
+# include <odb/details/config.h>
+# endif
#endif
// no post
diff --git a/odb/sqlite/makefile b/odb/sqlite/makefile
index abee73e..aa411e7 100644
--- a/odb/sqlite/makefile
+++ b/odb/sqlite/makefile
@@ -108,7 +108,7 @@ $(dist): headers_dist = $(subst $(src_base)/,,$(shell find $(src_base) \
$(dist): gen_headers := $(cli_tun:.cli=.hxx) $(cli_tun:.cli=.ixx)
$(dist): export headers = $(sort $(headers_dist) $(gen_headers))
$(dist): gen_dist := $(gen)
-$(dist): data_dist := $(cli_tun) details/config.h.in
+$(dist): data_dist := $(cli_tun) details/config.h.in details/config-vc.h
$(dist): export extra_dist := $(data_dist) \
libodb-sqlite-vc8.vcproj libodb-sqlite-vc9.vcproj \
libodb-sqlite-vc10.vcxproj libodb-sqlite-vc10.vcxproj.filters \