Skip to content

Building on Apple Silicion MacOS version 15.4 #13

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Building on Apple Silicion MacOS version 15.4 #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
da7a04f
Do not add SSE and AVX flags for ARM64 architecture
konchunas May 20, 2025
3e4cfb1
Force libpng dep at 1.6.47 to fix missing "fp.h" include
konchunas May 20, 2025
cc53e5e
Make libminiz private to fix duplicate symbols when linking on MacOS
konchunas May 20, 2025
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
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ if(TB_ENABLE_ASAN)
endif()

# Enable SSE4.1 and AVX support for intrinsics (e.g., _mm_blendv_ps) to avoid errors on Linux
if(UNIX)
if(UNIX AND (NOT CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64"))
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1")
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mavx")
endif()
Expand Down
3 changes: 2 additions & 1 deletion common/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1021,7 +1021,8 @@ set(COMMON_HEADER
add_library(common OBJECT ${COMMON_SOURCE} ${COMMON_HEADER})
set_target_properties(common PROPERTIES AUTOMOC TRUE)
target_include_directories(common PUBLIC ${COMMON_SOURCE_DIR})
target_link_libraries(common PUBLIC tinyxml2::tinyxml2 kdl vecmath GLEW::GLEW miniz::miniz freeimage::FreeImage freetype OpenGL::GL Qt5::Widgets Qt5::Svg fmt::fmt assimp::assimp tinybvh)
target_link_libraries(common PUBLIC tinyxml2::tinyxml2 kdl vecmath GLEW::GLEW freeimage::FreeImage freetype OpenGL::GL Qt5::Widgets Qt5::Svg fmt::fmt assimp::assimp tinybvh)
target_link_libraries(common PRIVATE miniz::miniz)

# use precompiled headers on CMake 3.16 or later
if (NOT TB_SUPPRESS_PCH AND ${CMAKE_VERSION} VERSION_GREATER_EQUAL "3.16.0")
Expand Down
5 changes: 5 additions & 0 deletions vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,11 @@
"name": "tinyxml2",
"version>=": "9.0.0",
"platform": "!linux"
},
{
"name": "libpng",
"version>=": "1.6.47#0",
"platform": "!linux"
}
],
"builtin-baseline": "13bde2ff13192e1b2fdd37bd9b475c7665ae6ae5",
Expand Down