From 92f0c01ee3858b4444d8c6304e26aa0432ffaf06 Mon Sep 17 00:00:00 2001 From: bgiot Date: Mon, 22 Jun 2020 16:47:57 +0200 Subject: [PATCH 1/2] Use the correct LIBPNG --- deps/wxWidgets/wxWidgets.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps/wxWidgets/wxWidgets.cmake b/deps/wxWidgets/wxWidgets.cmake index ee8a22c4f..34103c8ec 100644 --- a/deps/wxWidgets/wxWidgets.cmake +++ b/deps/wxWidgets/wxWidgets.cmake @@ -23,7 +23,7 @@ prusaslicer_add_cmake_project(wxWidgets -DwxUSE_DETECT_SM=OFF -DwxUSE_UNICODE=ON -DwxUSE_OPENGL=ON - -DwxUSE_LIBPNG=sys + -DwxUSE_LIBPNG=builtin -DwxUSE_ZLIB=sys -DwxUSE_REGEX=builtin -DwxUSE_LIBXPM=builtin From 21648c63565287dea03e0f5508ad23701e82bc0d Mon Sep 17 00:00:00 2001 From: bgiot Date: Mon, 6 Jul 2020 12:45:06 +0200 Subject: [PATCH 2/2] Fix macos deps --- deps/deps-macos.cmake | 2 ++ deps/wxWidgets/wxWidgets.cmake | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/deps/deps-macos.cmake b/deps/deps-macos.cmake index ef00b80d5..a71a0ebfc 100644 --- a/deps/deps-macos.cmake +++ b/deps/deps-macos.cmake @@ -9,6 +9,8 @@ set(DEP_CMAKE_OPTS "-DCMAKE_OSX_DEPLOYMENT_TARGET=${DEP_OSX_TARGET}" "-DCMAKE_CXX_FLAGS=${DEP_WERRORS_SDK}" "-DCMAKE_C_FLAGS=${DEP_WERRORS_SDK}" + "-DCMAKE_FIND_FRAMEWORK=LAST" + "-DCMAKE_FIND_APPBUNDLE=LAST" ) include("deps-unix-common.cmake") diff --git a/deps/wxWidgets/wxWidgets.cmake b/deps/wxWidgets/wxWidgets.cmake index 34103c8ec..ee8a22c4f 100644 --- a/deps/wxWidgets/wxWidgets.cmake +++ b/deps/wxWidgets/wxWidgets.cmake @@ -23,7 +23,7 @@ prusaslicer_add_cmake_project(wxWidgets -DwxUSE_DETECT_SM=OFF -DwxUSE_UNICODE=ON -DwxUSE_OPENGL=ON - -DwxUSE_LIBPNG=builtin + -DwxUSE_LIBPNG=sys -DwxUSE_ZLIB=sys -DwxUSE_REGEX=builtin -DwxUSE_LIBXPM=builtin