Skip to content

Commit 98e2fc0

Browse files
PerkseyPerksey
committed
Revert
1 parent 5923787 commit 98e2fc0

25 files changed

Lines changed: 22 additions & 103 deletions

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ 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 [[ "$@" == *"--install-deps"* ]]; then
7+
if [ ! -z "$GITHUB_ACTIONS" ]; 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
1211
fi
1312

1413
rm -rf build

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ 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 [[ "$@" == *"--install-deps"* ]]; then
7+
if [ ! -z "$GITHUB_ACTIONS" ]; 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
1211
fi
1312

1413
rm -rf build

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ 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 [[ "$@" == *"--install-deps"* ]]; then
7+
if [ ! -z "$GITHUB_ACTIONS" ]; 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
1211
fi
1312

1413
rm -rf build

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,16 @@ 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 [[ "$@" == *"--install-deps"* ]]; then
7+
if [ ! -z "$GITHUB_ACTIONS" ]; 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
1211
fi
1312

1413
rm -rf build
1514
mkdir build
1615
cd build
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
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
1817
cmake --build . --parallel
1918
cd ..
2019
mkdir -p runtimes/android-x86/native

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ 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-
106
rm -rf build
117
mkdir build
128
cd build

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ 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-
106
rm -rf build
117
mkdir build
128
cd build

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,18 @@ 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 [ -d ../../../eng/native/buildsystem/zig ]; then
7-
export PATH="$PATH:$(readlink -f "../../../eng/native/buildsystem/zig")"
8-
fi
9-
10-
if [[ "$@" == *"--install-deps"* ]]; then
6+
if [[ ! -z ${GITHUB_ACTIONS+x} ]]; then
117
../../../eng/native/buildsystem/download-zig.py
8+
export PATH="$PATH:$(readlink -f "../../../eng/native/buildsystem/zig")"
129
sudo apt-get update
1310
sudo apt-get install build-essential git make \
1411
pkg-config cmake ninja-build libasound2-dev libpulse-dev libsoundio-dev libsndfile1-dev libmysofa-dev \
1512
qtbase5-dev libdbus-1-dev libjack-dev portaudio19-dev libjack-dev libpipewire-0.3-dev qt6-base-dev
16-
exit
1713
fi
1814
rm -rf build
1915
mkdir build
2016
cd build
17+
whereis libpulse.so
2118
cmake ../../../../eng/submodules/openal-soft --debug-find -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../../../eng/native/cmake/zig-toolchain-arm-linux-gnueabihf.2.28.cmake -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF -DALSOFT_REQUIRE_RTKIT=ON -DALSOFT_REQUIRE_ALSA=ON -DALSOFT_REQUIRE_OSS=ON -DALSOFT_REQUIRE_PORTAUDIO=ON -DALSOFT_REQUIRE_PULSEAUDIO=ON -DALSOFT_REQUIRE_JACK=ON -DALSOFT_REQUIRE_PIPEWIRE=ON
2219
cmake --build . --parallel
2320
cd ..

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,18 @@ 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 [ -d ../../../eng/native/buildsystem/zig ]; then
7-
export PATH="$PATH:$(readlink -f "../../../eng/native/buildsystem/zig")"
8-
fi
9-
10-
if [[ "$@" == *"--install-deps"* ]]; then
6+
if [[ ! -z ${GITHUB_ACTIONS+x} ]]; then
117
../../../eng/native/buildsystem/download-zig.py
8+
export PATH="$PATH:$(readlink -f "../../../eng/native/buildsystem/zig")"
129
sudo apt-get update
1310
sudo apt-get install build-essential git make \
1411
pkg-config cmake ninja-build libasound2-dev libpulse-dev libsoundio-dev libsndfile1-dev libmysofa-dev \
1512
qtbase5-dev libdbus-1-dev libjack-dev portaudio19-dev libjack-dev libpipewire-0.3-dev qt6-base-dev
16-
exit
1713
fi
1814
rm -rf build
1915
mkdir build
2016
cd build
17+
whereis libpulse.so
2118
cmake ../../../../eng/submodules/openal-soft --debug-find -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../../../eng/native/cmake/zig-toolchain-aarch64-linux-gnu.2.28.cmake -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF -DALSOFT_REQUIRE_RTKIT=ON -DALSOFT_REQUIRE_ALSA=ON -DALSOFT_REQUIRE_OSS=ON -DALSOFT_REQUIRE_PORTAUDIO=ON -DALSOFT_REQUIRE_PULSEAUDIO=ON -DALSOFT_REQUIRE_JACK=ON -DALSOFT_REQUIRE_PIPEWIRE=ON
2219
cmake --build . --parallel
2320
cd ..

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

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,19 @@ 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 [ -d ../../../eng/native/buildsystem/zig ]; then
7-
export PATH="$PATH:$(readlink -f "../../../eng/native/buildsystem/zig")"
8-
fi
9-
10-
if [[ "$@" == *"--install-deps"* ]]; then
6+
if [[ ! -z ${GITHUB_ACTIONS+x} ]]; then
117
../../../eng/native/buildsystem/download-zig.py
8+
export PATH="$PATH:$(readlink -f "../../../eng/native/buildsystem/zig")"
129
sudo apt-get update
1310
sudo apt-get install build-essential git make \
1411
pkg-config cmake ninja-build libasound2-dev libpulse-dev libsoundio-dev libsndfile1-dev libmysofa-dev \
1512
qtbase5-dev libdbus-1-dev libjack-dev portaudio19-dev libjack-dev libpipewire-0.3-dev qt6-base-dev
16-
exit
1713
fi
1814
rm -rf build
1915
mkdir build
2016
cd build
21-
cmake ../../../../eng/submodules/openal-soft -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../../../eng/native/cmake/zig-toolchain-x86_64-linux-gnu.2.28.cmake -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF -DALSOFT_REQUIRE_RTKIT=ON -DALSOFT_REQUIRE_ALSA=ON -DALSOFT_REQUIRE_OSS=ON -DALSOFT_REQUIRE_PORTAUDIO=ON -DALSOFT_REQUIRE_PULSEAUDIO=ON -DALSOFT_REQUIRE_JACK=ON -DALSOFT_REQUIRE_PIPEWIRE=ON
17+
whereis libpulse.so
18+
cmake ../../../../eng/submodules/openal-soft --debug-find -DCMAKE_BUILD_TYPE=Release -DCMAKE_TOOLCHAIN_FILE=../../../../eng/native/cmake/zig-toolchain-x86_64-linux-gnu.2.28.cmake -DALSOFT_UTILS=OFF -DALSOFT_EXAMPLES=OFF -DALSOFT_REQUIRE_RTKIT=ON -DALSOFT_REQUIRE_ALSA=ON -DALSOFT_REQUIRE_OSS=ON -DALSOFT_REQUIRE_PORTAUDIO=ON -DALSOFT_REQUIRE_PULSEAUDIO=ON -DALSOFT_REQUIRE_JACK=ON -DALSOFT_REQUIRE_PIPEWIRE=ON
2219
cmake --build . --parallel
2320
cd ..
2421
mkdir -p runtimes/linux-x64/native

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,6 @@ 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-
106
rm -rf build
117
mkdir build
128
cd build

0 commit comments

Comments
 (0)