aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2016-08-14 11:29:59 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2016-08-14 11:29:59 +0200
commit2ce1b689c40e1fed002c960f1fbbee5058ed1627 (patch)
tree7ae0fa4459d67289511138d419b5eae9b94a762a
parentdc93d2e69df6e1649afff87ac49408649bdf608b (diff)
Minor config file restructuring in preparation for build2 support
-rw-r--r--odb/pgsql/details/config-vc.h6
-rw-r--r--odb/pgsql/details/config.hxx11
-rw-r--r--odb/pgsql/makefile2
3 files changed, 14 insertions, 5 deletions
diff --git a/odb/pgsql/details/config-vc.h b/odb/pgsql/details/config-vc.h
new file mode 100644
index 0000000..147ce25
--- /dev/null
+++ b/odb/pgsql/details/config-vc.h
@@ -0,0 +1,6 @@
+/* file : odb/pgsql/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/pgsql/details/config.hxx b/odb/pgsql/details/config.hxx
index 6ab242e..a270afe 100644
--- a/odb/pgsql/details/config.hxx
+++ b/odb/pgsql/details/config.hxx
@@ -7,11 +7,14 @@
// no pre
-#ifdef _MSC_VER
-#elif defined(ODB_COMPILER)
+#ifdef ODB_COMPILER
# error libodb-pgsql header included in odb-compiled header
-#else
-# include <odb/pgsql/details/config.h>
+#elif !defined(LIBODB_PGSQL_BUILD2)
+# ifdef _MSC_VER
+# include <odb/pgsql/details/config-vc.h>
+# else
+# include <odb/pgsql/details/config.h>
+# endif
#endif
// no post
diff --git a/odb/pgsql/makefile b/odb/pgsql/makefile
index 3564d9d..27b5d1c 100644
--- a/odb/pgsql/makefile
+++ b/odb/pgsql/makefile
@@ -103,7 +103,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-pgsql-vc8.vcproj libodb-pgsql-vc9.vcproj \
libodb-pgsql-vc10.vcxproj libodb-pgsql-vc10.vcxproj.filters \