From 742dec521a49b51f86ac9d3ab6c7f718177229e7 Mon Sep 17 00:00:00 2001 From: "MINI\\jairo" Date: Thu, 26 Jun 2025 18:14:24 -0500 Subject: [PATCH] Fix doubious ownership error --- External/build.sh | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/External/build.sh b/External/build.sh index 46e2b26..a0d1457 100755 --- a/External/build.sh +++ b/External/build.sh @@ -77,6 +77,7 @@ if [[ $RUNNER_OS == 'Linux' ]]; then git config --global --add safe.directory /workspace/External/SDL git config --global --add safe.directory /workspace/External/SDL_image git config --global --add safe.directory /workspace/External/SDL_ttf + git config --global --add safe.directory /workspace/External/SDL_mixer fi # Build SDL @@ -111,23 +112,6 @@ elif [[ $RUNNER_OS == 'macOS' ]]; then CMAKE_PREFIX_PATH="../SDL/install_output/lib/cmake/" fi -# Build SDL_mixer -pushd SDL_mixer -git reset --hard HEAD -cmake -B build $FLAGS -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSDL_SHARED_ENABLED_BY_DEFAULT=ON -DSDL_STATIC_ENABLED_BY_DEFAULT=ON -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DSDLMIXER_VENDORED=ON -cmake --build build/ --config Release -$SUDO cmake --install build/ --prefix install_output --config Release -popd - -# Move build lib into correct folders -if [[ $RUNNER_OS == 'Windows' ]]; then - cp SDL_mixer/install_output/bin/SDL3_mixer.dll ../native/$NAME/SDL3_mixer.dll -elif [[ $RUNNER_OS == 'Linux' ]]; then - cp SDL_mixer/install_output/lib/libSDL3_mixer.so ../native/$NAME/libSDL3_mixer.so -elif [[ $RUNNER_OS == 'macOS' ]]; then - cp SDL_mixer/install_output/lib/libSDL3_mixer.dylib ../native/$NAME/libSDL3_mixer.dylib -fi - # Build SDL_image pushd SDL_image git reset --hard HEAD @@ -164,4 +148,21 @@ elif [[ $RUNNER_OS == 'macOS' ]]; then cp SDL_ttf/install_output/lib/libSDL3_ttf.dylib ../native/$NAME/libSDL3_ttf.dylib fi +# Build SDL_mixer +pushd SDL_mixer +git reset --hard HEAD +cmake -B build $FLAGS -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DSDL_SHARED_ENABLED_BY_DEFAULT=ON -DSDL_STATIC_ENABLED_BY_DEFAULT=ON -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DSDLMIXER_VENDORED=ON +cmake --build build/ --config Release +$SUDO cmake --install build/ --prefix install_output --config Release +popd + +# Move build lib into correct folders +if [[ $RUNNER_OS == 'Windows' ]]; then + cp SDL_mixer/install_output/bin/SDL3_mixer.dll ../native/$NAME/SDL3_mixer.dll +elif [[ $RUNNER_OS == 'Linux' ]]; then + cp SDL_mixer/install_output/lib/libSDL3_mixer.so ../native/$NAME/libSDL3_mixer.so +elif [[ $RUNNER_OS == 'macOS' ]]; then + cp SDL_mixer/install_output/lib/libSDL3_mixer.dylib ../native/$NAME/libSDL3_mixer.dylib +fi + popd