Skip to content

Commit d44a99c

Browse files
committed
cmake+android: remove ability to build a shared SDL3_mixer library
1 parent e999eff commit d44a99c

File tree

8 files changed

+128
-2832
lines changed

8 files changed

+128
-2832
lines changed

.github/workflows/main.yml

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
platform:
18-
- { name: Windows (MSVC), os: windows-latest, shell: sh, cmake: '-DPerl_ROOT=C:/Strawberry/perl/bin/ -DSDLMIXER_VENDORED=ON -GNinja', msvc: 1, shared: 1, static: 0, artifact: 'SDL3_mixer-VC-x64' }
19-
- { name: Windows (mingw64), os: windows-latest, shell: 'msys2 {0}', msystem: mingw64, msys-env: mingw-w64-x86_64, shared: 1, static: 0, artifact: 'SDL3_mixer-mingw64',
18+
- { name: Windows (MSVC), os: windows-latest, shell: sh, cmake: '-DPerl_ROOT=C:/Strawberry/perl/bin/ -DSDLMIXER_VENDORED=ON -GNinja', msvc: 1, artifact: 'SDL3_mixer-VC-x64' }
19+
- { name: Windows (mingw64), os: windows-latest, shell: 'msys2 {0}', msystem: mingw64, msys-env: mingw-w64-x86_64, artifact: 'SDL3_mixer-mingw64',
2020
cmake: '-DSDLMIXER_VENDORED=OFF -G "Ninja Multi-Config"' }
21-
- { name: Linux, os: ubuntu-latest, shell: sh, cmake: '-DSDLMIXER_VENDORED=ON -GNinja', shared: 1, static: 0, artifact: 'SDL3_mixer-linux-x64' }
22-
- { name: 'Linux (static)', os: ubuntu-latest, shell: sh, cmake: '-DSDLMIXER_VENDORED=ON -DBUILD_SHARED_LIBS=OFF -GNinja', shared: 0, static: 1, artifact: 'SDL3_mixer-static-linux-x64' }
23-
- { name: Macos, os: macos-latest, shell: sh, cmake: '-DSDLMIXER_VENDORED=ON -GNinja', shared: 1, static: 0, artifact: 'SDL3_mixer-macos' }
21+
- { name: Linux, os: ubuntu-latest, shell: sh, cmake: '-DSDLMIXER_VENDORED=ON -GNinja', artifact: 'SDL3_mixer-linux-x64' }
22+
- { name: Macos, os: macos-latest, shell: sh, cmake: '-DSDLMIXER_VENDORED=ON -GNinja', artifact: 'SDL3_mixer-macos' }
2423

2524

2625
steps:
@@ -144,8 +143,8 @@ jobs:
144143
run: |
145144
cmake -S cmake/test -B cmake_config_build \
146145
-DCMAKE_BUILD_TYPE=Release \
147-
-DTEST_SHARED=${{ matrix.platform.shared }} \
148-
-DTEST_STATIC=${{ matrix.platform.static }}
146+
-DTEST_SHARED=FALSE \
147+
-DTEST_STATIC=TRUE
149148
cmake --build cmake_config_build --verbose --config Release
150149
151150
- uses: actions/upload-artifact@v4

.github/workflows/release.yml

Lines changed: 0 additions & 762 deletions
This file was deleted.

Android.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ endif
163163

164164
LOCAL_EXPORT_C_INCLUDES += $(LOCAL_PATH)/include
165165

166-
include $(BUILD_SHARED_LIBRARY)
166+
include $(BUILD_STATIC_LIBRARY)
167167

168168
###########################
169169
#

CMakeLists.txt

Lines changed: 120 additions & 164 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)