Edgaru089/SFML
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove support for 32-bit on OS X

Browse Source 
NOTE: external libraries are not updated in this commit but don't expect update to contain 32-bit symbols from now on.
This commit is contained in:
Marco Antognini 2016-03-31 19:05:08 +02:00 committed by Lukas Dürrenberger
parent ab09af3eae
commit 845c684ec8
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@ -187,15 +187,14 @@ if(SFML_OS_MACOSX)
endif() endif()
endif() endif()
# configure Xcode templates # only the default architecture (i.e. 64-bit) is supported
if(CMAKE_OSX_ARCHITECTURES) if(CMAKE_OSX_ARCHITECTURES AND NOT "${CMAKE_OSX_ARCHITECTURES}" STREQUAL "x86_64")
# maybe multiple arches are present in CMAKE_OSX_ARCHITECTURES message(FATAL_ERROR "Only 64-bit architecture is supported")
# we simply need to replace ';' by ' ' (space) and store the result in XCODE_TEMPLATES_ARCH return()
string(REPLACE ";" " " XCODE_TEMPLATES_ARCH "${CMAKE_OSX_ARCHITECTURES}")
else()
# no arch was provided to cmake, so we use the default one
set(XCODE_TEMPLATES_ARCH "\$(NATIVE_ARCH_ACTUAL)")
endif() endif()
# configure Xcode templates
set(XCODE_TEMPLATES_ARCH "\$(NATIVE_ARCH_ACTUAL)")
endif() endif()
if(SFML_OS_LINUX OR SFML_OS_FREEBSD) if(SFML_OS_LINUX OR SFML_OS_FREEBSD)
@ -281,7 +280,7 @@ else()
COMMAND cp -r ${PROJECT_SOURCE_DIR}/include/SFML/* $<TARGET_FILE_DIR:SFML>/Headers) COMMAND cp -r ${PROJECT_SOURCE_DIR}/include/SFML/* $<TARGET_FILE_DIR:SFML>/Headers)
# adapt install directory to allow distributing dylibs/frameworks in user's frameworks/application bundle # adapt install directory to allow distributing dylibs/frameworks in user's frameworks/application bundle
# NOTE: it's not required to link agains SFML.framework # NOTE: it's not required to link against SFML.framework
set_target_properties(SFML PROPERTIES set_target_properties(SFML PROPERTIES
BUILD_WITH_INSTALL_RPATH 1 BUILD_WITH_INSTALL_RPATH 1
INSTALL_NAME_DIR "@rpath") INSTALL_NAME_DIR "@rpath")