Skip to content

Fix Build on Apple Silicon #5316

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 5 commits into from
Closed

Fix Build on Apple Silicon #5316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d01f6b8
add -DDISABLE_DEPENDENCY_TRACKING to libpng.
Nov 28, 2020
d780b33
apple silicon target
Nov 28, 2020
1719a9b
fix typo and disable ARM_NEON check
Nov 28, 2020
d5a6602
bump gmp version
Nov 28, 2020
f61263b
Fix wxWidgets crash
obelisk Nov 28, 2020
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
13 changes: 8 additions & 5 deletions deps/GMP/GMP.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,23 +19,26 @@ if (MSVC)
else ()
set(_gmp_ccflags "-O2 -DNDEBUG -fPIC -DPIC -Wall -Wmissing-prototypes -Wpointer-arith -pedantic -fomit-frame-pointer -fno-common")
set(_gmp_build_tgt "${CMAKE_SYSTEM_PROCESSOR}")
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
set(_gmp_ccflags "${_gmp_ccflags} -march=armv7-a") # Works on RPi-4
set(_gmp_build_tgt armv7)
endif()

if (APPLE)
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
set(_gmp_build_tgt aarch64)
endif()
set(_gmp_ccflags "${_gmp_ccflags} -mmacosx-version-min=${DEP_OSX_TARGET}")
set(_gmp_build_tgt "--build=${_gmp_build_tgt}-apple-darwin")
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm")
set(_gmp_ccflags "${_gmp_ccflags} -march=armv7-a") # Works on RPi-4
set(_gmp_build_tgt armv7)
endif()
set(_gmp_build_tgt "--build=${_gmp_build_tgt}-pc-linux-gnu")
else ()
set(_gmp_build_tgt "") # let it guess
endif()

ExternalProject_Add(dep_GMP
# URL https://gmplib.org/download/gmp/gmp-6.1.2.tar.bz2
URL https://gmplib.org/download/gmp/gmp-6.2.0.tar.lz
URL https://gmplib.org/download/gmp/gmp-6.2.1.tar.bz2
BUILD_IN_SOURCE ON
CONFIGURE_COMMAND env "CFLAGS=${_gmp_ccflags}" "CXXFLAGS=${_gmp_ccflags}" ./configure --enable-shared=no --enable-cxx=yes --enable-static=yes "--prefix=${DESTDIR}/usr/local" ${_gmp_build_tgt}
BUILD_COMMAND make -j
Expand Down
2 changes: 2 additions & 0 deletions deps/PNG/PNG.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ prusaslicer_add_cmake_project(PNG
-DPNG_STATIC=ON
-DPNG_PREFIX=prusaslicer_
-DPNG_TESTS=OFF
-DDISABLE_DEPENDENCY_TRACKING=OFF
-DPNG_ARM_NEON=off
)

if (MSVC)
Expand Down
8 changes: 4 additions & 4 deletions deps/wxWidgets/wxWidgets.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
set(_wx_git_tag v3.1.3-patched)
#set(_wx_git_tag v3.1.3-patched)

# set(_patch_command "")
set(_wx_toolkit "")
Expand All @@ -11,8 +11,8 @@ if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
endif()

prusaslicer_add_cmake_project(wxWidgets
GIT_REPOSITORY "https://github.com/prusa3d/wxWidgets"
GIT_TAG ${_wx_git_tag}
GIT_REPOSITORY "https://github.com/wxWidgets/wxWidgets"
#GIT_TAG ${_wx_git_tag}
# PATCH_COMMAND "${_patch_command}"
DEPENDS ${PNG_PKG} ${ZLIB_PKG} ${EXPAT_PKG}
CMAKE_ARGS
Expand All @@ -34,4 +34,4 @@ prusaslicer_add_cmake_project(wxWidgets

if (MSVC)
add_debug_dep(dep_wxWidgets)
endif ()
endif ()
4 changes: 2 additions & 2 deletions src/slic3r/GUI/GUI_App.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,9 +216,9 @@ class GUI_App : public wxApp
virtual bool OnExceptionInMainLoop() override;

#ifdef __APPLE__
void OSXStoreOpenFiles(const wxArrayString &files) override;
void OSXStoreOpenFiles(const wxArrayString &files);
// wxWidgets override to get an event on open files.
void MacOpenFiles(const wxArrayString &fileNames) override;
void MacOpenFiles(const wxArrayString &fileNames);
#endif /* __APPLE */

Sidebar& sidebar();
Expand Down