mirror of
https://github.com/k4zmu2a/SpaceCadetPinball.git
synced 2024-11-23 17:30:18 +01:00
Use same /Libs folder as libs search path
This commit is contained in:
parent
5a9c05656d
commit
6f9e6159e1
3 changed files with 7 additions and 7 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -266,7 +266,7 @@ __pycache__/
|
|||
/Export
|
||||
/DrMem
|
||||
/Doc private
|
||||
# Windows local libraries
|
||||
# Windows and macOS local libraries
|
||||
/Libs
|
||||
|
||||
#CMake generated
|
||||
|
|
|
@ -24,8 +24,8 @@ if(APPLE)
|
|||
set(CMAKE_BUILD_WITH_INSTALL_RPATH true)
|
||||
set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks")
|
||||
set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
|
||||
list(APPEND SDL2_PATH "${CMAKE_CURRENT_LIST_DIR}/extern")
|
||||
list(APPEND SDL2_MIXER_PATH "${CMAKE_CURRENT_LIST_DIR}/extern")
|
||||
list(APPEND SDL2_PATH "${CMAKE_CURRENT_LIST_DIR}/Libs")
|
||||
list(APPEND SDL2_MIXER_PATH "${CMAKE_CURRENT_LIST_DIR}/Libs")
|
||||
endif()
|
||||
|
||||
# SDL2main is not needed
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
|
||||
set -xe
|
||||
|
||||
mkdir extern
|
||||
mkdir Libs
|
||||
|
||||
cd extern
|
||||
cd Libs
|
||||
|
||||
sdl_version='2.28.1'
|
||||
sdl_filename="SDL2-$sdl_version.dmg"
|
||||
|
@ -47,8 +47,8 @@ mkdir -p SpaceCadetPinball.app/Contents/Frameworks
|
|||
|
||||
cp -a Platform/macOS/Info.plist SpaceCadetPinball.app/Contents/
|
||||
cp -a Platform/macOS/SpaceCadetPinball.icns SpaceCadetPinball.app/Contents/Resources/
|
||||
cp -a extern/SDL2.framework SpaceCadetPinball.app/Contents/Frameworks/
|
||||
cp -a extern/SDL2_mixer.framework SpaceCadetPinball.app/Contents/Frameworks/
|
||||
cp -a Libs/SDL2.framework SpaceCadetPinball.app/Contents/Frameworks/
|
||||
cp -a Libs/SDL2_mixer.framework SpaceCadetPinball.app/Contents/Frameworks/
|
||||
cp -a bin/SpaceCadetPinball SpaceCadetPinball.app/Contents/MacOS/
|
||||
|
||||
sed -i '' "s/CHANGEME_SW_VERSION/$sw_version/" SpaceCadetPinball.app/Contents/Info.plist
|
||||
|
|
Loading…
Reference in a new issue