From 20a468ad8f9d77a3b2d45ee31187e404c288ab13 Mon Sep 17 00:00:00 2001 From: Lorenzooone Date: Fri, 6 Dec 2024 11:26:50 +0100 Subject: [PATCH] Test new SFML building --- CMakeLists.txt | 11 ++--------- setup_scripts/macos_bundle_setup.sh | 10 ---------- 2 files changed, 2 insertions(+), 19 deletions(-) delete mode 100755 setup_scripts/macos_bundle_setup.sh diff --git a/CMakeLists.txt b/CMakeLists.txt index f636874..b2c85cf 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,7 +76,8 @@ endif() include(FetchContent) FetchContent_Declare(SFML GIT_REPOSITORY https://github.com/SFML/SFML.git - GIT_TAG master) + GIT_TAG master + GIT_SHALLOW ON) if(USE_LIBUSB_SUPPORT) FetchContent_Declare(LibUSB @@ -575,8 +576,6 @@ if(WIN32) endif() if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") - set(FW_APP ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${OUTPUT_NAME}.app) - set(FW_DIRS ${sfml_SOURCE_DIR}/extlibs/libs-macos/Frameworks) set_target_properties(${OUTPUT_NAME} PROPERTIES MACOSX_BUNDLE TRUE MACOSX_BUNDLE_BUNDLE_NAME ${OUTPUT_NAME} @@ -584,12 +583,6 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/data/MacOSXBundleInfo.plist.in) set(CMAKE_MACOSX_RPATH TRUE) - add_custom_command( - TARGET ${OUTPUT_NAME} - COMMENT "Prepare bundle" - POST_BUILD COMMAND ${SETUP_SCRIPTS_DIR}/macos_bundle_setup${SCRIPT_EXTENSION} ${FW_APP}/Contents/MacOS/${OUTPUT_NAME} ${FW_DIRS} ${FW_APP}/Contents/Frameworks - VERBATIM - ) elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") else() install(FILES ${USB_RULES_DIR}/51-ftd3xx.rules DESTINATION .) diff --git a/setup_scripts/macos_bundle_setup.sh b/setup_scripts/macos_bundle_setup.sh deleted file mode 100755 index 7cfd179..0000000 --- a/setup_scripts/macos_bundle_setup.sh +++ /dev/null @@ -1,10 +0,0 @@ -framework_change_pos() { - install_name_tool -change @rpath/../Frameworks/${2}.framework/Versions/A/${2} @executable_path/../Frameworks/${2}.framework/${2} ${1} -} -cp -R ${2} ${3} -framework_change_pos ${1} 'freetype' -framework_change_pos ${1} 'vorbisenc' -framework_change_pos ${1} 'vorbisfile' -framework_change_pos ${1} 'FLAC' -framework_change_pos ${1} 'vorbis' -framework_change_pos ${1} 'ogg'