TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-01-19 20:24:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #939 from JeffProgrammer/macos_fixes_again

Browse source 
Fix LibPNG on Universal MacOS + Bump minimum MacOS version to 10.14
This commit is contained in:
Brian Roberts 2022-12-17 21:55:30 -06:00 committed by GitHub
parent 7d02eea6e4 d4a6ea4628
commit 120302383d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
Tools/CMake/libraries/lpng.cmake
View file

@ -22,26 +22,31 @@
project(lpng) project(lpng)
# addDef(PNG_NO_ASSEMBLER_CODE) if (APPLE AND TORQUE_MACOS_UNIVERSAL_BINARY)
# Enables NEON for libpng
if ( TORQUE_CPU_ARM32 OR TORQUE_CPU_ARM64 )
set(PNG_ARM_NEON on CACHE STRING "")
add_definitions(-DPNG_ARM_NEON_OPT=1)
addPath("${libDir}/lpng/arm") addPath("${libDir}/lpng/arm")
else()
set(PNG_ARM_NEON off CACHE STRING "")
add_definitions(-DPNG_ARM_NEON_OPT=0)
endif()
# Enables SSE for libpng - also takes care of compiler warnings. set(CMAKE_XCODE_ATTRIBUTE_PER_ARCH_CFLAGS_x86_64 "-DPNG_INTEL_SSE_OPT=1 -DPNG_ARM_NEON_OPT=0")
if ( TORQUE_CPU_X32 OR TORQUE_CPU_X64 ) set(CMAKE_XCODE_ATTRIBUTE_PER_ARCH_CFLAGS_arm64 "-DPNG_ARM_NEON_OPT=1 -DPNG_INTEL_SSE_OPT=0")
set(PNG_INTEL_SSE on CACHE STRING "")
add_definitions(-DPNG_INTEL_SSE_OPT=1)
addPath("${libDir}/lpng/intel")
else() else()
set(PNG_INTEL_SSE off CACHE STRING "") # Enables NEON for libpng
add_definitions(-DPNG_INTEL_SSE_OPT=0) if ( TORQUE_CPU_ARM32 OR TORQUE_CPU_ARM64 )
set(PNG_ARM_NEON on CACHE STRING "" FORCE)
add_definitions(-DPNG_ARM_NEON_OPT=1)
addPath("${libDir}/lpng/arm")
else()
set(PNG_ARM_NEON off CACHE STRING "" FORCE)
add_definitions(-DPNG_ARM_NEON_OPT=0)
endif()
# Enables SSE for libpng - also takes care of compiler warnings.
if ( TORQUE_CPU_X32 OR TORQUE_CPU_X64 )
set(PNG_INTEL_SSE on CACHE STRING "" FORCE)
add_definitions(-DPNG_INTEL_SSE_OPT=1)
addPath("${libDir}/lpng/intel")
else()
set(PNG_INTEL_SSE off CACHE STRING "" FORCE)
add_definitions(-DPNG_INTEL_SSE_OPT=0)
endif()
endif() endif()
mark_as_advanced(PNG_INTEL_SSE) mark_as_advanced(PNG_INTEL_SSE)
@ -50,3 +55,4 @@ mark_as_advanced(PNG_ARM_NEON)
addInclude(${libDir}/zlib) addInclude(${libDir}/zlib)
finishLibrary("${libDir}/${PROJECT_NAME}") finishLibrary("${libDir}/${PROJECT_NAME}")

4
Tools/CMake/torque3d.cmake
View file

@ -742,14 +742,14 @@ if (APPLE AND NOT IOS)
# Detect architecture if not using universal # Detect architecture if not using universal
if (TORQUE_MACOS_UNIVERSAL_BINARY) if (TORQUE_MACOS_UNIVERSAL_BINARY)
set(ARCHITECTURE_STRING_APPLE "x86_64;arm64") set(ARCHITECTURE_STRING_APPLE "x86_64;arm64")
set(DEPLOYMENT_TARGET_APPLE "10.13") set(DEPLOYMENT_TARGET_APPLE "10.14")
else() else()
if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm64") if (CMAKE_SYSTEM_PROCESSOR MATCHES "arm64")
set(ARCHITECTURE_STRING_APPLE "arm64") set(ARCHITECTURE_STRING_APPLE "arm64")
set(DEPLOYMENT_TARGET_APPLE "11.0") set(DEPLOYMENT_TARGET_APPLE "11.0")
else() else()
set(ARCHITECTURE_STRING_APPLE "x86_64") set(ARCHITECTURE_STRING_APPLE "x86_64")
set(DEPLOYMENT_TARGET_APPLE "10.9") set(DEPLOYMENT_TARGET_APPLE "10.14")
endif() endif()
endif() endif()