Skip to content

Commit 09ade4a

Browse files
committed
Add SDL_shadercross submobdule and build
1 parent fdd9cef commit 09ade4a

4 files changed

Lines changed: 22 additions & 1 deletion

File tree

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ jobs:
119119

120120
- name: Build (iOS)
121121
run: |
122-
modules=("SDL3" "SDL3_image" "SDL3_ttf" "SDL3_mixer")
122+
modules=("SDL3" "SDL3_image" "SDL3_ttf" "SDL3_mixer" "SDL_shadercross")
123123
architectures=("ios-arm64" "ios-arm64_x86_64-simulator")
124124
125125
for module in "${modules[@]}"; do

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,6 @@
1313
path = External/SDL_mixer
1414
url = https://github.com/libsdl-org/SDL_mixer.git
1515
branch = main
16+
[submodule "External/SDL_shadercross"]
17+
path = External/SDL_shadercross
18+
url = https://github.com/libsdl-org/SDL_shadercross.git

External/SDL_shadercross

Submodule SDL_shadercross added at 4ce7483

External/build.sh

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ if [[ $BUILD_PLATFORM != 'Android' ]]; then
5252
wayland-scanner++ \
5353
wayland-protocols \
5454
meson \
55+
patchelf \
5556
pkg-config$TARGET_APT_ARCH \
5657
libasound2-dev$TARGET_APT_ARCH \
5758
libdbus-1-dev$TARGET_APT_ARCH \
@@ -115,6 +116,7 @@ if [[ $RUNNER_OS == 'Linux' ]]; then
115116
git config --global --add safe.directory $PWD/SDL_image
116117
git config --global --add safe.directory $PWD/SDL_ttf
117118
git config --global --add safe.directory $PWD/SDL_mixer
119+
git config --global --add safe.directory $PWD/SDL_shadercross
118120
fi
119121

120122
CMAKE_INSTALL_PREFIX="$PWD/install_output"
@@ -159,9 +161,20 @@ run_cmake() {
159161
cmake --build build/ --config $BUILD_TYPE --verbose
160162
cmake --install build/ --prefix $CMAKE_INSTALL_PREFIX --config $BUILD_TYPE
161163

164+
# Add loader rpath
165+
if [[ $BUILD_PLATFORM == 'Linux' ]]; then
166+
patchelf $CMAKE_INSTALL_PREFIX/$LIB_OUTPUT --add-rpath "\$ORIGIN"
167+
elif [[ $BUILD_PLATFORM == 'macOS' ]]; then
168+
install_name_tool $CMAKE_INSTALL_PREFIX/$LIB_OUTPUT -add_rpath "@loader_path"
169+
fi
170+
162171
# Move build lib into correct folders
163172
cp $CMAKE_INSTALL_PREFIX/$LIB_OUTPUT ../../native/$NATIVE_PATH
164173

174+
if [[ $LIB_NAME == 'SDL_shadercross' ]]; then
175+
cp $CMAKE_INSTALL_PREFIX/${OUTPUT_LIB/SDL3variant/spirv-cross-c-shared} ../../native/$NATIVE_PATH
176+
fi
177+
165178
popd
166179
}
167180

@@ -181,4 +194,8 @@ run_cmake SDL_image ${OUTPUT_LIB/variant/_image} -DCMAKE_PREFIX_PATH=$CMAKE_PREF
181194
# See: https://github.com/libsdl-org/SDL_mixer/issues/745
182195
run_cmake SDL_mixer ${OUTPUT_LIB/variant/_mixer} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DSDLMIXER_MP3_MPG123=OFF -DSDLMIXER_FLAC_LIBFLAC=OFF -DSDLMIXER_DEPS_SHARED=OFF -DSDLMIXER_VENDORED=ON
183196

197+
# Build SDL_shadercross
198+
run_cmake SDL_shadercross ${OUTPUT_LIB/variant/_shadercross} -DCMAKE_PREFIX_PATH=$CMAKE_PREFIX_PATH -DSDLSHADERCROSS_DXC=OFF -DSDLSHADERCROSS_INSTALL=ON -DSDLSHADERCROSS_SHARED=ON -DSDLSHADERCROSS_VENDORED=ON
199+
184200
popd
201+

0 commit comments

Comments
 (0)