Skip to content

Commit 8f30049

Browse files
committed
Split dependency installation and building steps
1 parent f8d85db commit 8f30049

25 files changed

Lines changed: 78 additions & 12 deletions

sources/OpenAL/Soft.Native/build-android-arm.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ if [ ! -e ../../../eng/submodules/openal-soft/CMakeLists.txt ]; then
44
git submodule update --init --recursive --depth 1 ../../../eng/submodules/openal-soft
55
fi
66

7-
if [ ! -z "$GITHUB_ACTIONS" ]; then
7+
if [[ "$@" == *"--install-deps"* ]]; then
88
# NDK already installed: https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
99
sdkmanager=( /usr/local/lib/android/sdk/cmdline-tools/*/bin/sdkmanager )
1010
${sdkmanager[-1]} --install "platforms;android-21"
11+
exit
1112
fi
1213

1314
rm -rf build

sources/OpenAL/Soft.Native/build-android-arm64.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ if [ ! -e ../../../eng/submodules/openal-soft/CMakeLists.txt ]; then
44
git submodule update --init --recursive --depth 1 ../../../eng/submodules/openal-soft
55
fi
66

7-
if [ ! -z "$GITHUB_ACTIONS" ]; then
7+
if [[ "$@" == *"--install-deps"* ]]; then
88
# NDK already installed: https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
99
sdkmanager=( /usr/local/lib/android/sdk/cmdline-tools/*/bin/sdkmanager )
1010
${sdkmanager[-1]} --install "platforms;android-21"
11+
exit
1112
fi
1213

1314
rm -rf build

sources/OpenAL/Soft.Native/build-android-x64.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,11 @@ if [ ! -e ../../../eng/submodules/openal-soft/CMakeLists.txt ]; then
44
git submodule update --init --recursive --depth 1 ../../../eng/submodules/openal-soft
55
fi
66

7-
if [ ! -z "$GITHUB_ACTIONS" ]; then
7+
if [[ "$@" == *"--install-deps"* ]]; then
88
# NDK already installed: https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
99
sdkmanager=( /usr/local/lib/android/sdk/cmdline-tools/*/bin/sdkmanager )
1010
${sdkmanager[-1]} --install "platforms;android-21"
11+
exit
1112
fi
1213

1314
rm -rf build

sources/OpenAL/Soft.Native/build-android-x86.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,17 @@ if [ ! -e ../../../eng/submodules/openal-soft/CMakeLists.txt ]; then
44
git submodule update --init --recursive --depth 1 ../../../eng/submodules/openal-soft
55
fi
66

7-
if [ ! -z "$GITHUB_ACTIONS" ]; then
7+
if [[ "$@" == *"--install-deps"* ]]; then
88
# NDK already installed: https://github.com/actions/runner-images/blob/main/images/ubuntu/Ubuntu2404-Readme.md
99
sdkmanager=( /usr/local/lib/android/sdk/cmdline-tools/*/bin/sdkmanager )
1010
${sdkmanager[-1]} --install "platforms;android-21"
11+
exit
1112
fi
1213

1314
rm -rf build
1415
mkdir build
1516
cd build
16-
cmake ../../../../eng/submodules/openal-soft -DANDROID_ABI=x86 -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake" -DANDROID_PLATFORM=21 -DCMAKE_BUILD_TYPE=Release -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF
17+
cmake ../../../../eng/submodules/openal-soft -DANDROID_ABI=x86 -DCMAKE_TOOLCHAIN_FILE="${ANDROID_NDK_HOME}/build/cmake/android.toolchain.cmake" -DANDROID_PLATFORM=21 -DCMAKE_BUILD_TYPE=Release -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF -DALSOFT_EMBED_HRTF_DATA=TRUE -DALSOFT_REQUIRE_OPENSL=ON
1718
cmake --build . --parallel
1819
cd ..
1920
mkdir -p runtimes/android-x86/native

sources/OpenAL/Soft.Native/build-ios.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ if [ ! -e ../../../eng/submodules/openal-soft/CMakeLists.txt ]; then
33
git submodule update --init --recursive --depth 1 ../../../eng/submodules/openal-soft
44
fi
55

6+
if [[ "$@" == *"--install-deps"* ]]; then
7+
exit
8+
fi
9+
610
rm -rf build
711
mkdir build
812
cd build

sources/OpenAL/Soft.Native/build-iossimulator.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ if [ ! -e ../../../eng/submodules/openal-soft/CMakeLists.txt ]; then
33
git submodule update --init --recursive --depth 1 ../../../eng/submodules/openal-soft
44
fi
55

6+
if [[ "$@" == *"--install-deps"* ]]; then
7+
exit
8+
fi
9+
610
rm -rf build
711
mkdir build
812
cd build

sources/OpenAL/Soft.Native/build-linux-arm.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ if [ ! -e ../../../eng/submodules/openal-soft/CMakeLists.txt ]; then
33
git submodule update --init --recursive --depth 1 ../../../eng/submodules/openal-soft
44
fi
55

6-
if [[ ! -z ${GITHUB_ACTIONS+x} ]]; then
6+
if [[ "$@" == *"--install-deps"* ]]; then
77
../../../eng/native/buildsystem/download-zig.py
88
export PATH="$PATH:$(readlink -f "../../../eng/native/buildsystem/zig")"
99
sudo apt-get update
1010
sudo apt-get install build-essential git make \
1111
pkg-config cmake ninja-build libasound2-dev libpulse-dev libsoundio-dev libsndfile1-dev libmysofa-dev \
1212
qtbase5-dev libdbus-1-dev libjack-dev portaudio19-dev libjack-dev libpipewire-0.3-dev qt6-base-dev
13+
exit
1314
fi
1415
rm -rf build
1516
mkdir build

sources/OpenAL/Soft.Native/build-linux-arm64.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ if [ ! -e ../../../eng/submodules/openal-soft/CMakeLists.txt ]; then
33
git submodule update --init --recursive --depth 1 ../../../eng/submodules/openal-soft
44
fi
55

6-
if [[ ! -z ${GITHUB_ACTIONS+x} ]]; then
6+
if [[ "$@" == *"--install-deps"* ]]; then
77
../../../eng/native/buildsystem/download-zig.py
88
export PATH="$PATH:$(readlink -f "../../../eng/native/buildsystem/zig")"
99
sudo apt-get update
1010
sudo apt-get install build-essential git make \
1111
pkg-config cmake ninja-build libasound2-dev libpulse-dev libsoundio-dev libsndfile1-dev libmysofa-dev \
1212
qtbase5-dev libdbus-1-dev libjack-dev portaudio19-dev libjack-dev libpipewire-0.3-dev qt6-base-dev
13+
exit
1314
fi
1415
rm -rf build
1516
mkdir build

sources/OpenAL/Soft.Native/build-linux-x64.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ if [ ! -e ../../../eng/submodules/openal-soft/CMakeLists.txt ]; then
33
git submodule update --init --recursive --depth 1 ../../../eng/submodules/openal-soft
44
fi
55

6-
if [[ ! -z ${GITHUB_ACTIONS+x} ]]; then
6+
if [[ "$@" == *"--install-deps"* ]]; then
77
../../../eng/native/buildsystem/download-zig.py
88
export PATH="$PATH:$(readlink -f "../../../eng/native/buildsystem/zig")"
99
sudo apt-get update
1010
sudo apt-get install build-essential git make \
1111
pkg-config cmake ninja-build libasound2-dev libpulse-dev libsoundio-dev libsndfile1-dev libmysofa-dev \
1212
qtbase5-dev libdbus-1-dev libjack-dev portaudio19-dev libjack-dev libpipewire-0.3-dev qt6-base-dev
13+
exit
1314
fi
1415
rm -rf build
1516
mkdir build

sources/OpenAL/Soft.Native/build-osx.sh

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ if [ ! -e ../../../eng/submodules/openal-soft/CMakeLists.txt ]; then
33
git submodule update --init --recursive --depth 1 ../../../eng/submodules/openal-soft
44
fi
55

6+
if [[ "$@" == *"--install-deps"* ]]; then
7+
exit
8+
fi
9+
610
rm -rf build
711
mkdir build
812
cd build

0 commit comments

Comments
 (0)