From 9396ed4a2ea957dfa8d5b70590d6798e29c7a05d Mon Sep 17 00:00:00 2001
From: Mavo <matthias.volk@rwth-aachen.de>
Date: Tue, 3 May 2016 15:14:58 +0200
Subject: [PATCH] Fixed python after merge

Former-commit-id: 73c1c88a1f7d76a048520a38b7ab1f073abaf1a8
---
 src/CMakeLists.txt                               | 2 +-
 stormpy/setup.py                                 | 2 +-
 stormpy/src/common.h                             | 1 -
 stormpy/src/logic/{formulas.cpp => formulae.cpp} | 5 +++--
 stormpy/src/logic/formulae.h                     | 8 ++++++++
 stormpy/src/logic/formulas.h                     | 8 --------
 stormpy/src/mod_logic.cpp                        | 4 ++--
 7 files changed, 15 insertions(+), 15 deletions(-)
 rename stormpy/src/logic/{formulas.cpp => formulae.cpp} (98%)
 create mode 100644 stormpy/src/logic/formulae.h
 delete mode 100644 stormpy/src/logic/formulas.h

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7f2c5ce54..c36e4c9c2 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -112,7 +112,7 @@ endif(ADDITIONAL_LINK_DIRS)
 ##  All link_directories() calls MUST be made before this point               #
 ##                                                                            #
 ###############################################################################
-add_library(storm STATIC ${STORM_LIB_SOURCES} ${STORM_LIB_HEADERS}) # Adding headers for xcode
+add_library(storm SHARED ${STORM_LIB_SOURCES} ${STORM_LIB_HEADERS}) # Adding headers for xcode
 add_dependencies(storm sylvan)
 add_dependencies(storm resources)
 add_executable(storm-main ${STORM_MAIN_SOURCES} ${STORM_MAIN_HEADERS})
diff --git a/stormpy/setup.py b/stormpy/setup.py
index 934a482d8..72bb6b628 100755
--- a/stormpy/setup.py
+++ b/stormpy/setup.py
@@ -24,7 +24,7 @@ carl_dir = "/Users/mvolk/develop/carl/src/"
 include_dirs.append(carl_dir)
 boost_dir = '/usr/local/include/'
 include_dirs.append(boost_dir)
-cudd_dirs = ['../resources/3rdparty/cudd-2.5.0/src/obj/', '../resources/3rdparty/cudd-2.5.0/src/cudd', '../resources/3rdparty/cudd-2.5.0/src/mtr/', '../resources/3rdparty/cudd-2.5.0/src/epd/']
+cudd_dirs = ['../resources/3rdparty/cudd-3.0.0/cplusplus/', '../resources/3rdparty/cudd-3.0.0/mtr/', '../resources/3rdparty/cudd-3.0.0/cudd/']
 include_dirs.extend(cudd_dirs)
 log4cplus_dirs = ['../resources/3rdparty/log4cplus-1.1.3-rc1/include/', '../build/resources/3rdparty/log4cplus-1.1.3-rc1/include/']
 include_dirs.extend(log4cplus_dirs)
diff --git a/stormpy/src/common.h b/stormpy/src/common.h
index bf8a19c39..bff6e3be3 100644
--- a/stormpy/src/common.h
+++ b/stormpy/src/common.h
@@ -12,7 +12,6 @@
 #include <pybind11/stl.h>
 #include <tuple>
 
-#include "includes.h"
 namespace py = pybind11;
 
 #if PY_MAJOR_VERSION >= 3
diff --git a/stormpy/src/logic/formulas.cpp b/stormpy/src/logic/formulae.cpp
similarity index 98%
rename from stormpy/src/logic/formulas.cpp
rename to stormpy/src/logic/formulae.cpp
index 47e347d74..92c90db3e 100644
--- a/stormpy/src/logic/formulas.cpp
+++ b/stormpy/src/logic/formulae.cpp
@@ -1,8 +1,9 @@
-#include "formulas.h"
+#include "formulae.h"
 
 #include "src/common.h"
+#include "src/logic/Formulas.h"
 
-void define_formulas(py::module& m) {
+void define_formulae(py::module& m) {
  
     py::enum_<storm::logic::ComparisonType>(m, "ComparisonType")
         .value("LESS", storm::logic::ComparisonType::Less)
diff --git a/stormpy/src/logic/formulae.h b/stormpy/src/logic/formulae.h
new file mode 100644
index 000000000..d499685e7
--- /dev/null
+++ b/stormpy/src/logic/formulae.h
@@ -0,0 +1,8 @@
+#ifndef PYTHON_LOGIC_FORMULAE_H_
+#define PYTHON_LOGIC_FORMULAE_H_
+
+#include "src/common.h"
+
+void define_formulae(py::module& m);
+
+#endif /* PYTHON_LOGIC_FORMULAE_H_ */
diff --git a/stormpy/src/logic/formulas.h b/stormpy/src/logic/formulas.h
deleted file mode 100644
index 965ca32c8..000000000
--- a/stormpy/src/logic/formulas.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef PYTHON_LOGIC_FORMULAS_H_
-#define PYTHON_LOGIC_FORMULAS_H_
-
-#include "src/common.h"
-
-void define_formulas(py::module& m);
-
-#endif /* PYTHON_LOGIC_FORMULAS_H_ */
diff --git a/stormpy/src/mod_logic.cpp b/stormpy/src/mod_logic.cpp
index eb9d1f7f8..49f16d7aa 100644
--- a/stormpy/src/mod_logic.cpp
+++ b/stormpy/src/mod_logic.cpp
@@ -1,9 +1,9 @@
 #include "common.h"
 
-#include "logic/formulas.h"
+#include "logic/formulae.h"
 
 PYBIND11_PLUGIN(logic) {
     py::module m("stormpy.logic", "Logic module for Storm");
-    define_formulas(m);
+    define_formulae(m);
     return m.ptr();
 }