From 6f924a09df4f1a835dba10b68f28004293e39692 Mon Sep 17 00:00:00 2001 From: Joseph Lenox Date: Thu, 10 May 2018 18:48:24 -0500 Subject: [PATCH] Fix some linking under MinGW. --- src/CMakeLists.txt | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index d99259a0b..e9a911c6d 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -232,8 +232,15 @@ IF (WIN32) add_library(boost-nowide STATIC ${LIBDIR}/boost/nowide/iostream.cpp ) + target_link_libraries(slic3r boost-nowide) - target_link_libraries(slic3r STATIC boost-nowide) + # Windows findwxwidgets doesn't get everything needed for wxMSW + target_link_libraries(slic3r uxtheme) + # MinGW apparently has some multiple definitions of UUID-related items + # deal with it. + if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") + set(CMAKE_EXE_LINKER_FLAGS "-Wl,--allow-multiple-definition") + endif() # target_link_libraries(extrude-tin boost-nowide) ENDIF(WIN32)