AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes for Apple Silicon 

Updates amuse, hecl, nod, specter
This commit is contained in:
Luke Street 2021-01-06 20:47:25 -05:00
parent 0cdacb1f37
commit 4b9bdcc802
7 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -131,6 +131,7 @@ if(MSVC)
endif() endif()
else() else()
if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL x86_64)
if(${URDE_VECTOR_ISA} STREQUAL "native") if(${URDE_VECTOR_ISA} STREQUAL "native")
add_compile_options(-march=native) add_compile_options(-march=native)
message(STATUS "Building with native ISA") message(STATUS "Building with native ISA")
@ -154,6 +155,7 @@ else()
else() else()
message(STATUS "Building with x87 Vector ISA") message(STATUS "Building with x87 Vector ISA")
endif() endif()
endif()
include(CheckCXXCompilerFlag) include(CheckCXXCompilerFlag)
check_cxx_compiler_flag(-fno-plt HAS_NO_PLT) check_cxx_compiler_flag(-fno-plt HAS_NO_PLT)

27
Editor/CMakeLists.txt
View File

@ -85,6 +85,24 @@ add_executable(urde WIN32 MACOSX_BUNDLE
Resource.hpp Resource.cpp Resource.hpp Resource.cpp
Camera.hpp Camera.cpp Camera.hpp Camera.cpp
GameMode.hpp GameMode.cpp) GameMode.hpp GameMode.cpp)
target_compile_definitions(urde PUBLIC URDE_DLPACKAGE="${URDE_DLPACKAGE}")
target_include_directories(urde PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_SOURCE_DIR}
${CMAKE_SOURCE_DIR}/Runtime # FIXME atdna cmake issue
${CMAKE_BINARY_DIR})
target_link_libraries(urde
UrdeIcons
UrdeBadging
RuntimeCommon
amuse
RetroDataSpec
kabufuda
${URDE_PLAT_LIBS})
target_atdna(urde atdna_Space.cpp Space.hpp) target_atdna(urde atdna_Space.cpp Space.hpp)
target_atdna(urde atdna_ResourceBrowser.cpp ResourceBrowser.hpp) target_atdna(urde atdna_ResourceBrowser.cpp ResourceBrowser.hpp)
target_atdna(urde atdna_ModelViewer.cpp ModelViewer.hpp) target_atdna(urde atdna_ModelViewer.cpp ModelViewer.hpp)
@ -92,15 +110,6 @@ target_atdna(urde atdna_ParticleEditor.cpp ParticleEditor.hpp)
target_atdna(urde atdna_InformationCenter.cpp InformationCenter.hpp) target_atdna(urde atdna_InformationCenter.cpp InformationCenter.hpp)
target_atdna(urde atdna_GameMode.cpp GameMode.hpp) target_atdna(urde atdna_GameMode.cpp GameMode.hpp)
target_compile_definitions(urde PUBLIC URDE_DLPACKAGE="${URDE_DLPACKAGE}")
target_include_directories(urde PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_BINARY_DIR})
target_link_libraries(urde
UrdeIcons
UrdeBadging
RuntimeCommon
${URDE_PLAT_LIBS})
if(COMMAND add_sanitizers) if(COMMAND add_sanitizers)
add_sanitizers(urde) add_sanitizers(urde)
endif() endif()

2
Editor/main.cpp
View File

@ -25,6 +25,7 @@ static hecl::SystemString CPUFeatureString(const zeus::CPUInfo& cpuInf) {
features += _SYS_STR(", "); features += _SYS_STR(", ");
features += str; features += str;
}; };
#if __x86_64__
if (cpuInf.AESNI) if (cpuInf.AESNI)
AddFeature(_SYS_STR("AES-NI")); AddFeature(_SYS_STR("AES-NI"));
if (cpuInf.SSE1) if (cpuInf.SSE1)
@ -45,6 +46,7 @@ static hecl::SystemString CPUFeatureString(const zeus::CPUInfo& cpuInf) {
AddFeature(_SYS_STR("AVX")); AddFeature(_SYS_STR("AVX"));
if (cpuInf.AVX2) if (cpuInf.AVX2)
AddFeature(_SYS_STR("AVX2")); AddFeature(_SYS_STR("AVX2"));
#endif
return features; return features;
} }

2
amuse

@ -1 +1 @@
Subproject commit 12752933271d7cf5ba48b8170e23c23c77257244 Subproject commit d3c4f568bbe3dc5d74bd0e5d323b1450e651802c

2
hecl

@ -1 +1 @@
Subproject commit 2b75ffed470e6f9287da83bca72039ab2598c261 Subproject commit 8d5c99e10a9f23399906f606d59ed7e55abba09e

2
nod

@ -1 +1 @@
Subproject commit d53d6770386b5944a4e65251bde30596332bdc2c Subproject commit 02c188497af89e188edcc82387f787057739e530

2
specter

@ -1 +1 @@
Subproject commit 23f70151250ac08c78559ad71bf92e80912e678d Subproject commit a323942118918bda0e9c5c6a9cfc41a21a60ef65