From 8485cb3d61755384d9e459e06d3fa1535f953682 Mon Sep 17 00:00:00 2001 From: Ray Speth Date: Tue, 31 Jan 2023 13:16:16 -0500 Subject: [PATCH] WIP: second try at MinGW symbol export --- ext/eigen | 2 +- include/cantera/extensions/PythonExtensionManager.h | 8 -------- src/extensions/PythonExtensionManager.cpp | 10 ++++++++++ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ext/eigen b/ext/eigen index 21ae2afd4ed..3147391d946 160000 --- a/ext/eigen +++ b/ext/eigen @@ -1 +1 @@ -Subproject commit 21ae2afd4edaa1b69782c67a54182d34efe43f9c +Subproject commit 3147391d946bb4b6c68edd901f2add6ac1f31f8c diff --git a/include/cantera/extensions/PythonExtensionManager.h b/include/cantera/extensions/PythonExtensionManager.h index ee6039ca1e0..be67dc7b151 100644 --- a/include/cantera/extensions/PythonExtensionManager.h +++ b/include/cantera/extensions/PythonExtensionManager.h @@ -8,12 +8,6 @@ #include "cantera/base/ExtensionManager.h" -#define BOOST_DLL_USE_STD_FS -#ifdef __MINGW32__ -#define BOOST_DLL_FORCE_ALIAS_INSTANTIATION -#endif -#include - namespace Cantera { @@ -49,8 +43,6 @@ class PythonExtensionManager : public ExtensionManager static bool s_imported; }; -BOOST_DLL_ALIAS(Cantera::PythonExtensionManager::registerSelf, registerPythonExtensionManager); - } #endif diff --git a/src/extensions/PythonExtensionManager.cpp b/src/extensions/PythonExtensionManager.cpp index d971023353d..ee6a8b89c1f 100644 --- a/src/extensions/PythonExtensionManager.cpp +++ b/src/extensions/PythonExtensionManager.cpp @@ -20,6 +20,16 @@ #include #endif +#define BOOST_DLL_USE_STD_FS +#ifdef __MINGW32__ +#define BOOST_DLL_FORCE_ALIAS_INSTANTIATION +#endif +#include + +// This creates and exports the name that is imported from Application::loadExtension +BOOST_DLL_ALIAS(Cantera::PythonExtensionManager::registerSelf, + registerPythonExtensionManager); + namespace ba = boost::algorithm; using namespace std;