Lorenzooone/cc3dsfs
1
Fork 0
mirror of https://github.com/Lorenzooone/cc3dsfs.git synced 2025-06-19 00:55:38 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Test new SFML building

Browse Source
This commit is contained in:
Lorenzooone 2024-12-06 11:26:50 +01:00
parent 3285fe7ef6
commit 20a468ad8f
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
CMakeLists.txt
View File

@ -76,7 +76,8 @@ endif()
include(FetchContent) include(FetchContent)
FetchContent_Declare(SFML FetchContent_Declare(SFML
GIT_REPOSITORY https://github.com/SFML/SFML.git GIT_REPOSITORY https://github.com/SFML/SFML.git
GIT_TAG master) GIT_TAG master
GIT_SHALLOW ON)
if(USE_LIBUSB_SUPPORT) if(USE_LIBUSB_SUPPORT)
FetchContent_Declare(LibUSB FetchContent_Declare(LibUSB
@ -575,8 +576,6 @@ if(WIN32)
endif() endif()
if(${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") 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 set_target_properties(${OUTPUT_NAME} PROPERTIES
MACOSX_BUNDLE TRUE MACOSX_BUNDLE TRUE
MACOSX_BUNDLE_BUNDLE_NAME ${OUTPUT_NAME} 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) MACOSX_BUNDLE_INFO_PLIST ${CMAKE_SOURCE_DIR}/data/MacOSXBundleInfo.plist.in)
set(CMAKE_MACOSX_RPATH TRUE) 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") elseif(${CMAKE_SYSTEM_NAME} STREQUAL "Windows")
else() else()
install(FILES ${USB_RULES_DIR}/51-ftd3xx.rules DESTINATION .) install(FILES ${USB_RULES_DIR}/51-ftd3xx.rules DESTINATION .)

10
setup_scripts/macos_bundle_setup.sh
View File

@ -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'