Merge pull request #481 from pheest/master

LIBXML_STATIC needs to be defined in ADSrc for mingw static builds.
areaDetector · Jan 1, 2024 · 0a02e36 · 0a02e36
2 parents 7210484 + 154f5fc
commit 0a02e36
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/ADApp/ADSrc/Makefile b/ADApp/ADSrc/Makefile
@@ -11,6 +11,11 @@ ifeq (vxWorks,$(findstring vxWorks, $(T_A)))
 CODE_CXXFLAGS=
 endif
 
+ifneq ($(SHARED_LIBRARIES), YES)
+   USR_CFLAGS_WIN32 += -DLIBXML_STATIC
+   USR_CXXFLAGS_WIN32 += -DLIBXML_STATIC
+endif
+
 # The following flag is need to compile/link NDArray.cpp on Solaris
 ifeq ($(GNU),NO)
   NDArray_CXXFLAGS_solaris += -features=tmplrefstatic

diff --git a/ADApp/pluginSrc/Makefile b/ADApp/pluginSrc/Makefile
@@ -239,6 +239,11 @@ ifeq (vxWorks,$(findstring vxWorks, $(T_A)))
   CODE_CXXFLAGS=
 endif
 
+# Hack to allow multiple definition of _Unwind_Resume produced by MingW on Linux.
+ifeq (mingw,$(findstring mingw, $(T_A)))
+  USR_LDFLAGS += -Wl,-allow-multiple-definition
+endif
+
 include $(TOP)/ADApp/commonLibraryMakefile
 
 include $(TOP)/configure/RULES