Merge in 1.4.1 changes

salilab · Nov 21, 2022 · 2ee681f · 2ee681f
2 parents 826d9c0 + 1479067
commit 2ee681f
Show file tree

Hide file tree

Showing 14 changed files with 20 additions and 488 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -1,6 +1,11 @@
 Change Log {#changelog}
 ==========
 
+# 1.4.1 - 2022-11-21 # {#changelog_1_4_1}
+- Build fixes to work with SWIG 4.1.
+- Various internal build scripts now use 'python3' rather than
+  unversioned 'python'.
+
 # 1.4 - 2022-03-10 # {#changelog_1_4}
 - RMF now requires a C++11 compiler and SWIG 3 (or later) to build. Most
   recent compilers should support C++11, such as gcc, clang

diff --git a/config.h.in b/config.h.in
@@ -11,6 +11,11 @@
 #ifndef RMF_CONFIG_H
 #define RMF_CONFIG_H
 
+/* Protect against RMFEXPORT being defined already */
+#ifdef RMFEXPORT
+#undef RMFEXPORT
+#endif
+
 #ifdef _MSC_VER
 
 #ifdef RMF_EXPORTS

diff --git a/rmf.sublime-project b/rmf.sublime-project