Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions ADApp/ADSrc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions ADApp/pluginSrc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,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
Expand Down