Fix compile on windows & linux

9 files changed, 229 insertions, 33 deletions

diff --git a/deps/Blosc/Blosc.cmake b/deps/Blosc/Blosc.cmake
index 45c45c7c9..d7a5e3997 100644
--- a/deps/Blosc/Blosc.cmake
+++ b/deps/Blosc/Blosc.cmake
@@ -6,6 +6,7 @@ else()
     set(_build_static ON)
 endif()
 
+if(IS_CROSS_COMPILE AND APPLE)
 prusaslicer_add_cmake_project(Blosc
     #URL https://github.com/Blosc/c-blosc/archive/refs/tags/v1.17.0.zip
     #URL_HASH SHA256=7463a1df566704f212263312717ab2c36b45d45cba6cd0dccebf91b2cc4b4da9
@@ -21,7 +22,27 @@ prusaslicer_add_cmake_project(Blosc
         -DBUILD_TESTS=OFF 
         -DBUILD_BENCHMARKS=OFF 
         -DPREFER_EXTERNAL_ZLIB=ON
+        -DDEACTIVATE_SSE2=ON
+        -DDEACTIVATE_AVX2=ON
 )
+else()
+prusaslicer_add_cmake_project(Blosc
+    #URL https://github.com/Blosc/c-blosc/archive/refs/tags/v1.17.0.zip
+    #URL_HASH SHA256=7463a1df566704f212263312717ab2c36b45d45cba6cd0dccebf91b2cc4b4da9
+    URL https://github.com/tamasmeszaros/c-blosc/archive/refs/heads/v1.17.0_tm.zip
+    URL_HASH SHA256=dcb48bf43a672fa3de6a4b1de2c4c238709dad5893d1e097b8374ad84b1fc3b3
+    DEPENDS ${ZLIB_PKG}
+    # Patching upstream does not work this way with git version 2.28 installed on mac worker
+    # PATCH_COMMAND  ${GIT_EXECUTABLE} apply --ignore-space-change --whitespace=fix ${CMAKE_CURRENT_LIST_DIR}/blosc-mods.patch
+    CMAKE_ARGS
+        -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+        -DBUILD_SHARED=${_build_shared} 
+        -DBUILD_STATIC=${_build_static}
+        -DBUILD_TESTS=OFF 
+        -DBUILD_BENCHMARKS=OFF 
+        -DPREFER_EXTERNAL_ZLIB=ON
+)
+endif()
 
 if (MSVC)
     add_debug_dep(dep_Blosc)
diff --git a/deps/Boost/Boost.cmake b/deps/Boost/Boost.cmake
index 470e3dacf..dff46ef8f 100644
--- a/deps/Boost/Boost.cmake
+++ b/deps/Boost/Boost.cmake
@@ -67,16 +67,6 @@ include(ProcessorCount)
 ProcessorCount(NPROC)
 file(TO_NATIVE_PATH ${DESTDIR}/usr/local/ _prefix)
 
-set(_boost_flags "")
-if (UNIX) 
-    set(_boost_flags "cflags=-fPIC;cxxflags=-fPIC")
-elseif(APPLE)
-    set(_boost_flags 
-        "cflags=-fPIC -mmacosx-version-min=${DEP_OSX_TARGET};"
-        "cxxflags=-fPIC -mmacosx-version-min=${DEP_OSX_TARGET};"
-        "mflags=-fPIC -mmacosx-version-min=${DEP_OSX_TARGET};"
-        "mmflags=-fPIC -mmacosx-version-min=${DEP_OSX_TARGET}") 
-endif()
 
 set(_boost_variants "")
 if(CMAKE_BUILD_TYPE)
@@ -102,13 +92,33 @@ endif()
 
 if (IS_CROSS_COMPILE AND APPLE)
     if (${CMAKE_OSX_ARCHITECTURES} MATCHES "arm")
+        message(STATUS "Compiling Boost for arm64.")
+        message(STATUS "Compiling Boost with toolset ${_boost_toolset}.")
+        message(STATUS "Compiling Boost with libs ${_libs}.")
+        message(STATUS "Compiling Boost with variant ${_boost_variants}.")
+        message(STATUS "Compiling Boost with _bootstrap_cmd ${_bootstrap_cmd}.")
+        message(STATUS "_boost_linkflags = ${_boost_linkflags}")
         set(_arch_flags "-arch arm64")
+        set(_boost_linkflags "linkflags=${_arch_flags}")
+        message(STATUS "_cmake_args_osx_arch = '${_cmake_args_osx_arch}'")
     elseif (${CMAKE_OSX_ARCHITECTURES} MATCHES "x86_64")
+        message(STATUS "Compiling Boost for x86_64.")
         set(_arch_flags "-arch x86_64")
     endif()
     set(_boost_linkflags "linkflags=${_arch_flags}")
 endif ()
 
+set(_boost_flags "")
+if (UNIX) 
+    set(_boost_flags "cflags=-fPIC;cxxflags=-fPIC")
+elseif(APPLE)
+    set(_boost_flags 
+        "cflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};"
+        "cxxflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};"
+        "mflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET};"
+        "mmflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET}") 
+endif()
+
 set(_build_cmd ${_build_cmd}
                ${_boost_flags}
                ${_boost_linkflags}
@@ -127,6 +137,11 @@ set(_build_cmd ${_build_cmd}
 
 set(_install_cmd ${_build_cmd} --prefix=${_prefix} install)
 
+if (NOT IS_CROSS_COMPILE OR NOT APPLE OR BUILD_SHARED_LIBS)
+    message(STATUS "Standard boost build with bootstrap command '${_bootstrap_cmd}'")
+    message(STATUS "Standard boost build with patch command '${_patch_command}'")
+    message(STATUS "Standard boost build with build command '${_build_cmd}'")
+    message(STATUS "Standard boost build with install command '${_install_cmd}'")
 ExternalProject_Add(
     dep_Boost
 #    URL "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz"
@@ -140,7 +155,55 @@ ExternalProject_Add(
     INSTALL_COMMAND "${_install_cmd}"
 )
 
+else()
+
+ExternalProject_Add(
+    dep_Boost
+#    URL "https://boostorg.jfrog.io/artifactory/main/release/1.75.0/source/boost_1_75_0.tar.gz"
+    URL "https://github.com/supermerill/SuperSlicer_deps/releases/download/1.75/boost_1_75_0.tar.gz"
+    URL_HASH SHA256=aeb26f80e80945e82ee93e5939baebdca47b9dee80a07d3144be1e1a6a66dd6a
+    DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost
+    CONFIGURE_COMMAND ./bootstrap.sh
+        --with-toolset=clang
+        --with-libraries=date_time,filesystem,iostreams,locale,log,regex,system,thread
+        "--prefix=${DESTDIR}/usr/local"
+#    PATCH_COMMAND ${_patch_command}
+    BUILD_COMMAND "${_build_cmd}"
+    BUILD_IN_SOURCE    ON
+    INSTALL_COMMAND "${_install_cmd}"
+)
+    # message(STATUS "Old boost build")
+# ExternalProject_Add(dep_boost
+# #    EXCLUDE_FROM_ALL ON
+    # URL "https://github.com/supermerill/SuperSlicer_deps/releases/download/1.75/boost_1_75_0.tar.gz"
+    # URL_HASH SHA256=aeb26f80e80945e82ee93e5939baebdca47b9dee80a07d3144be1e1a6a66dd6a
+    # DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/Boost
+    # BUILD_IN_SOURCE ON
+    # CONFIGURE_COMMAND ./bootstrap.sh
+        # --with-toolset=clang
+        # --with-libraries=date_time,filesystem,iostreams,locale,log,regex,system,thread
+        # "--prefix=${DESTDIR}/usr/local"
+    # BUILD_COMMAND ./b2
+        # -j ${NPROC}
+        # --reconfigure
+        # toolset=clang
+        # link=static
+        # variant=release
+        # threading=multi
+        # boost.locale.icu=off
+        # --disable-icu
+        # "cflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET}"
+        # "cxxflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET}"
+        # "mflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET}"
+        # "mmflags=-fPIC ${_arch_flags} -mmacosx-version-min=${DEP_OSX_TARGET}"
+        # ${_boost_linkflags}
+        # install
+    # INSTALL_COMMAND "${_install_cmd}"
+# )
+endif()
+
 if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
+    message(STATUS "Patch the boost::polygon library with a custom one.")
     # Patch the boost::polygon library with a custom one.
     ExternalProject_Add(dep_boost_polygon
         EXCLUDE_FROM_ALL ON
@@ -152,6 +215,7 @@ if ("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
         DEPENDS dep_Boost
         CONFIGURE_COMMAND ""
         BUILD_COMMAND ""
+        ${_cmake_args_osx_arch}
         INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
             "${CMAKE_CURRENT_BINARY_DIR}/dep_boost_polygon-prefix/src/dep_boost_polygon/include/boost/polygon"
             "${DESTDIR}/usr/local/include/boost/polygon"
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
index 12eca6056..69e0892dd 100644
--- a/deps/CMakeLists.txt
+++ b/deps/CMakeLists.txt
@@ -46,12 +46,15 @@ if (APPLE)
     set(CMAKE_FIND_FRAMEWORK LAST)
     set(CMAKE_FIND_APPBUNDLE LAST)
     list(FIND CMAKE_OSX_ARCHITECTURES ${CMAKE_SYSTEM_PROCESSOR} _arch_idx)
+    message(STATUS "prusaslicer_add_cmake_project for Apple")
     if (CMAKE_OSX_ARCHITECTURES AND _arch_idx LESS 0)
+        message(STATUS "prusaslicer_add_cmake_project for Apple crosscompiling")
         set(IS_CROSS_COMPILE TRUE)
+        set(CMAKE_CXX_COMPILER_ID "Clang")
         string(REPLACE ";" "$<SEMICOLON>" CMAKE_OSX_ARCHS "${CMAKE_OSX_ARCHITECTURES}")
         set(_cmake_osx_arch -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHS})
         set(_cmake_args_osx_arch CMAKE_ARGS -DCMAKE_OSX_ARCHITECTURES:STRING=${CMAKE_OSX_ARCHS})
-        message("Detect Cross-compilation. Will build for target ${CMAKE_OSX_ARCHS}" )
+        message(STATUS "Detect Cross-compilation. Will build for target ${CMAKE_OSX_ARCHS}" )
     endif ()
 endif ()
 
@@ -92,6 +95,7 @@ function(prusaslicer_add_cmake_project projectname)
         set(_build_j "/m")
     endif ()
 
+if (NOT IS_CROSS_COMPILE OR NOT APPLE)
     ExternalProject_Add(
         dep_${projectname}
         EXCLUDE_FROM_ALL    ON
@@ -115,7 +119,26 @@ function(prusaslicer_add_cmake_project projectname)
        BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Release -- ${_build_j}
        INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config Release
     )
+else()
+    ExternalProject_Add(
+        dep_${projectname}
+        EXCLUDE_FROM_ALL    ON
+        INSTALL_DIR         ${DESTDIR}/usr/local
+        DOWNLOAD_DIR        ${DEP_DOWNLOAD_DIR}/${projectname}
+        ${_gen}
+        CMAKE_ARGS
+            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}/usr/local
+            -DBUILD_SHARED_LIBS:BOOL=OFF
+            ${_cmake_osx_arch}
+            "${_configs_line}"
+            ${DEP_CMAKE_OPTS}
+            ${P_ARGS_CMAKE_ARGS}
+       ${P_ARGS_UNPARSED_ARGUMENTS}
+       BUILD_COMMAND ${CMAKE_COMMAND} --build . --config Release -- ${_build_j}
+       INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config Release
+    )
 
+endif()
 endfunction(prusaslicer_add_cmake_project)
 
 
diff --git a/deps/OpenEXR/OpenEXR.cmake b/deps/OpenEXR/OpenEXR.cmake
index 046223fed..4df8c15da 100644
--- a/deps/OpenEXR/OpenEXR.cmake
+++ b/deps/OpenEXR/OpenEXR.cmake
@@ -1,3 +1,34 @@
+# Check if we're building for arm on x86_64 and just for OpenEXR, build fat
+# binaries.  We need this because it compiles some code to generate other
+# source and we need to be able to run the executables.  When we link the
+# library, the x86_64 part will be ignored.
+if (APPLE AND IS_CROSS_COMPILE)
+    if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" AND ${CMAKE_OSX_ARCHITECTURES} MATCHES "arm")
+        set(_openexr_arch arm64^^x86_64)
+        set(_openxr_list_sep LIST_SEPARATOR ^^)
+        set(_cmake_openexr_arch -DCMAKE_OSX_ARCHITECTURES:STRING=${_openexr_arch})
+    else()
+        set(_openexr_arch ${CMAKE_OSX_ARCHITECTURES})
+        set(_cmake_openexr_arch -DCMAKE_OSX_ARCHITECTURES:STRING=${_openexr_arch})
+    endif()
+    ExternalProject_Add(dep_OpenEXR
+        EXCLUDE_FROM_ALL    ON
+        URL https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v2.5.5.zip
+        URL_HASH SHA256=0307a3d7e1fa1e77e9d84d7e9a8694583fbbbfd50bdc6884e2c96b8ef6b902de
+        INSTALL_DIR         ${DESTDIR}/usr/local
+        DOWNLOAD_DIR        ${DEP_DOWNLOAD_DIR}/OpenEXR
+        ${_openxr_list_sep}
+        CMAKE_ARGS
+            -DCMAKE_INSTALL_PREFIX:STRING=${DESTDIR}/usr/local
+            -DBUILD_SHARED_LIBS:BOOL=OFF
+            -DCMAKE_POSITION_INDEPENDENT_CODE=ON
+            -DBUILD_TESTING=OFF 
+            -DPYILMBASE_ENABLE:BOOL=OFF 
+            -DOPENEXR_VIEWERS_ENABLE:BOOL=OFF
+            -DOPENEXR_BUILD_UTILS:BOOL=OFF
+            ${_cmake_openexr_arch}
+    )
+else()
 prusaslicer_add_cmake_project(OpenEXR
     # GIT_REPOSITORY https://github.com/openexr/openexr.git
     URL https://github.com/AcademySoftwareFoundation/openexr/archive/refs/tags/v2.5.5.zip
@@ -11,6 +42,7 @@ prusaslicer_add_cmake_project(OpenEXR
         -DOPENEXR_VIEWERS_ENABLE:BOOL=OFF
         -DOPENEXR_BUILD_UTILS:BOOL=OFF
 )
+endif()
 
 if (MSVC)
     add_debug_dep(dep_OpenEXR)
diff --git a/deps/OpenVDB/OpenVDB.cmake b/deps/OpenVDB/OpenVDB.cmake
index 10dc2d916..71180fc7e 100644
--- a/deps/OpenVDB/OpenVDB.cmake
+++ b/deps/OpenVDB/OpenVDB.cmake
@@ -6,21 +6,44 @@ else()
     set(_build_static ON)
 endif()
 
-prusaslicer_add_cmake_project(OpenVDB
-    URL https://github.com/tamasmeszaros/openvdb/archive/refs/tags/v6.2.1-prusa3d.zip #v6.2.1 patched
-    URL_HASH SHA256=caf9f0c91976722883ff9cb32420ef142af22f7e625fc643b91c23d6e4172f62 
-    DEPENDS dep_TBB dep_Blosc dep_OpenEXR dep_Boost
-    CMAKE_ARGS
-        -DCMAKE_POSITION_INDEPENDENT_CODE=ON 
-        -DOPENVDB_BUILD_PYTHON_MODULE=OFF
-        -DUSE_BLOSC=ON
-        -DOPENVDB_CORE_SHARED=${_build_shared} 
-        -DOPENVDB_CORE_STATIC=${_build_static}
-        -DOPENVDB_ENABLE_RPATH:BOOL=OFF
-        -DTBB_STATIC=${_build_static}
-        -DOPENVDB_BUILD_VDB_PRINT=ON
-        -DDISABLE_DEPENDENCY_VERSION_CHECKS=ON # Centos6 has old zlib
-)
+if (APPLE)
+    find_package(zstd REQUIRED)
+endif()
+
+if(APPLE AND NOT BUILD_SHARED_LIBS)
+    prusaslicer_add_cmake_project(OpenVDB
+        URL https://github.com/tamasmeszaros/openvdb/archive/refs/tags/v6.2.1-prusa3d.zip #v6.2.1 patched
+        URL_HASH SHA256=caf9f0c91976722883ff9cb32420ef142af22f7e625fc643b91c23d6e4172f62 
+        DEPENDS dep_TBB dep_Blosc dep_OpenEXR dep_Boost
+        CMAKE_ARGS
+            -DCMAKE_POSITION_INDEPENDENT_CODE=ON 
+            -DOPENVDB_BUILD_PYTHON_MODULE=OFF
+            -DUSE_BLOSC=ON
+            -DOPENVDB_CORE_SHARED=${_build_shared} 
+            -DOPENVDB_CORE_STATIC=${_build_static}
+            -DOPENVDB_ENABLE_RPATH:BOOL=OFF
+            -DTBB_STATIC=${_build_static}
+            -DOPENVDB_BUILD_VDB_PRINT=ON
+            -DDISABLE_DEPENDENCY_VERSION_CHECKS=ON # Centos6 has old zlib
+#            -DCMAKE_STATIC_LINKER_FLAGS="${BREW_ZSTD_PREFIX}/lib/libzstd.a"
+    )
+else()
+    prusaslicer_add_cmake_project(OpenVDB
+        URL https://github.com/tamasmeszaros/openvdb/archive/refs/tags/v6.2.1-prusa3d.zip #v6.2.1 patched
+        URL_HASH SHA256=caf9f0c91976722883ff9cb32420ef142af22f7e625fc643b91c23d6e4172f62 
+        DEPENDS dep_TBB dep_Blosc dep_OpenEXR dep_Boost
+        CMAKE_ARGS
+            -DCMAKE_POSITION_INDEPENDENT_CODE=ON 
+            -DOPENVDB_BUILD_PYTHON_MODULE=OFF
+            -DUSE_BLOSC=ON
+            -DOPENVDB_CORE_SHARED=${_build_shared} 
+            -DOPENVDB_CORE_STATIC=${_build_static}
+            -DOPENVDB_ENABLE_RPATH:BOOL=OFF
+            -DTBB_STATIC=${_build_static}
+            -DOPENVDB_BUILD_VDB_PRINT=ON
+            -DDISABLE_DEPENDENCY_VERSION_CHECKS=ON # Centos6 has old zlib
+    )
+endif()
 
 if (MSVC)
     if (${DEP_DEBUG})
diff --git a/deps/PNG/macos-arm64.patch b/deps/PNG/macos-arm64.patch
index ec7802eb6..ee9d01326 100644
--- a/deps/PNG/macos-arm64.patch
+++ b/deps/PNG/macos-arm64.patch
@@ -1,5 +1,10 @@
 Based on https://github.com/vespakoen/libpng to work around until
 https://github.com/glennrp/libpng/pull/354 is resolved.
+also added patch from PS2.4 (PNG.pach) in pngrutil.c
+---
+ CMakeLists.txt | 28 ++++++++++++++++++++--------
+ pngrutil.c     |  7 -------
+ 2 files changed, 20 insertions(+), 15 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 index 4db9bb87d..9099d1edf 100644
@@ -63,11 +68,11 @@ index 4db9bb87d..9099d1edf 100644
    set(PNG_MIPS_MSA_POSSIBLE_VALUES on off)
    set(PNG_MIPS_MSA "on" CACHE STRING "Enable MIPS_MSA optimizations:
       off: disable the optimizations")
-
-diff -u ../libpng-1.6.35-orig/pngrutil.c ./pngrutil.c
---- ../libpng-1.6.35-orig/pngrutil.c	2018-07-15 20:58:00.000000000 +0200
-+++ ./pngrutil.c	2021-03-24 15:59:38.687108444 +0100
-@@ -422,13 +422,6 @@
+diff --git a/pngrutil.c b/pngrutil.c
+index 7001f1976..91930f1f2 100644
+--- a/pngrutil.c
++++ b/pngrutil.c
+@@ -422,13 +422,6 @@ png_inflate_claim(png_structrp png_ptr, png_uint_32 owner)
              png_ptr->flags |= PNG_FLAG_ZSTREAM_INITIALIZED;
        }
  
@@ -80,3 +85,6 @@ diff -u ../libpng-1.6.35-orig/pngrutil.c ./pngrutil.c
 -
        if (ret == Z_OK)
           png_ptr->zowner = owner;
+ 
+-- 
+2.33.0.windows.1
diff --git a/deps/TIFF/TIFF.cmake b/deps/TIFF/TIFF.cmake
index f92dd0811..3f925459e 100644
--- a/deps/TIFF/TIFF.cmake
+++ b/deps/TIFF/TIFF.cmake
@@ -1,5 +1,21 @@
 find_package(OpenGL QUIET REQUIRED)
 
+
+if (APPLE)
+    message(STATUS "Compiling TIFF for macos ${CMAKE_SYSTEM_VERSION}.")
+    prusaslicer_add_cmake_project(TIFF
+        URL https://gitlab.com/libtiff/libtiff/-/archive/v4.3.0/libtiff-v4.3.0.zip
+        URL_HASH SHA256=4fca1b582c88319f3ad6ecd5b46320eadaf5eb4ef6f6c32d44caaae4a03d0726
+        DEPENDS ${ZLIB_PKG} ${PNG_PKG} dep_JPEG
+        CMAKE_ARGS
+            -Dlzma:BOOL=OFF
+            -Dwebp:BOOL=OFF
+            -Djbig:BOOL=OFF
+            -Dzstd:BOOL=OFF
+            -Dpixarlog:BOOL=OFF
+    )
+else()
+
 prusaslicer_add_cmake_project(TIFF
     URL https://gitlab.com/libtiff/libtiff/-/archive/v4.1.0/libtiff-v4.1.0.zip
     URL_HASH SHA256=c56edfacef0a60c0de3e6489194fcb2f24c03dbb550a8a7de5938642d045bd32
@@ -11,3 +27,5 @@ prusaslicer_add_cmake_project(TIFF
         -Dzstd:BOOL=OFF
         -Dpixarlog:BOOL=OFF
 )
+
+endif()
diff --git a/deps/deps-macos.cmake b/deps/deps-macos.cmake
index 7d8669bbe..bd5eb3a47 100644
--- a/deps/deps-macos.cmake
+++ b/deps/deps-macos.cmake
@@ -23,15 +23,22 @@ if (IS_CROSS_COMPILE)
     endif()
 
     if (${CMAKE_OSX_ARCHITECTURES} MATCHES "arm")
+        message(STATUS "Compiling slic3r for macos arm64.")
         set(_host_arch aarch64)
         set(_arch_flags "-arch arm64")
     elseif (${CMAKE_OSX_ARCHITECTURES} MATCHES "x86_64")
+        message(STATUS "Compiling slic3r for macos x86_64.")
         set(_host_arch x86_64)
         set(_arch_flags "-arch x86_64")
     endif()
     set(_boost_linkflags "linkflags=${_arch_flags}")
     set(_build_tgt --build=${_build_arch}-apple-darwin --host=${_host_arch}-apple-darwin)
     set(_env_curl env "CFLAGS=${_arch_flags}")
+    message(STATUS "TEST _build_arch = ${_build_arch}")
+    message(STATUS "TEST _host_arch = ${_host_arch}")
+    message(STATUS "TEST _boost_linkflags = ${_boost_linkflags}")
+    message(STATUS "TEST _build_tgt = '${_build_tgt}'")
+    message(STATUS "TEST _env_curl = ${_env_curl}")
 endif ()
 
 # ExternalProject_Add(dep_boost
diff --git a/deps/wxWidgets/wxWidgets.cmake b/deps/wxWidgets/wxWidgets.cmake
index 062901338..14c50260a 100644
--- a/deps/wxWidgets/wxWidgets.cmake
+++ b/deps/wxWidgets/wxWidgets.cmake
@@ -13,7 +13,7 @@ prusaslicer_add_cmake_project(wxWidgets
     # GIT_REPOSITORY "https://github.com/prusa3d/wxWidgets"
     # GIT_TAG tm_cross_compile #${_wx_git_tag}
     URL https://github.com/prusa3d/wxWidgets/archive/refs/heads/v3.1.4-patched.zip
-    URL_HASH SHA256=1dc34e0ef90c2a05b36df3c6a87ff80254186e23d5035b6500e82f4da628152a
+    URL_HASH SHA256=69dec874981d2fc3d90345660c27f3450d8430c483e8446edcc87b6ed18bff8f
     DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG} dep_TIFF dep_JPEG
     CMAKE_ARGS
         -DwxBUILD_PRECOMP=ON
@@ -37,4 +37,4 @@ prusaslicer_add_cmake_project(wxWidgets
 
 if (MSVC)
     add_debug_dep(dep_wxWidgets)
-endif ()
\ No newline at end of file
+endif ()