Merge branch 'dev' into dev-decouple

2018-03-21 15:53:08 -04:00
parent 73463770e5 bbe40c5ba4
commit 801bc1bb9c
11 changed files with 512 additions and 22 deletions
--- a/tools/epanet-output/setup.py
+++ b/tools/epanet-output/setup.py
@@ -25,6 +25,8 @@ setup(
    version = "0.1.0-alpha",
    ext_modules = [
        Extension("_epanet_output",
+            define_macros = [('epanet_output_EXPORTS', None)],
+            include_dirs = ['include'],
            sources = ['src/epanet_output.i', 'src/epanet_output.c', 'src/errormanager.c'],
            swig_opts=['-modern'],
            language = 'C'