From 405fbdfff7c123a7c3081f3f501f4b82254e6957 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Tue, 8 May 2018 12:27:24 +0200
Subject: Tweak buildfile

---
 odb/buildfile | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/odb/buildfile b/odb/buildfile
index e7e3f45..0dd11aa 100644
--- a/odb/buildfile
+++ b/odb/buildfile
@@ -2,15 +2,21 @@
 # copyright : Copyright (c) 2009-2017 Code Synthesis Tools CC
 # license   : GNU GPL v3; see accompanying LICENSE file
 
+plugin_dir = $config.odb.plugin_dir
+
 define plugin: libs
 plugin{*}: bin.lib.prefix = # No lib prefix.
-plugin{*}: install =        # @@ TODO
+
+# On Windows we want the plugin (odb.dll) to go into bin/ (default), next to
+# the driver (odb.exe) since failed that we won't be able to find libraries we
+# depend on.
+#
+if ($cxx.target.system != 'mingw32')
+  plugin{*}: install = $plugin_dir
 
 import libs  = libcutl%lib{cutl}
 import libs += libstudxml%lib{studxml}
 
-plugin_dir = $config.odb.plugin_dir
-
 ./: exe{odb} plugin{odb}
 
 exe{odb}: cxx{odb}
@@ -23,9 +29,9 @@ if ($cxx.target.system == 'mingw32')
 
 libus{odb}: {hxx ixx txx cxx}{** -odb -options} {hxx ixx cxx}{options} $libs
 
+cxx.poptions += "-I$plugin_dir/include" -DODB_GCC_PLUGIN_DIR
 cxx.poptions += -DODB_BUILD2 # @@ TMP while supporting other build systems.
 
-
 # Don't install any of the plugin's headers.
 #
 {hxx ixx txx}{*}: install = false
-- 
cgit v1.1