Skip to content

Commit bef0137

Browse files
committed
add submodule sdl3
1 parent 8bec859 commit bef0137

File tree

3 files changed

+16
-4
lines changed

3 files changed

+16
-4
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "SDL2"]
22
path = SDL2
33
url = https://github.com/libsdl-org/sdl2-compat
4+
[submodule "SDL3"]
5+
path = SDL3
6+
url = https://github.com/libsdl-org/SDL

SDL3

Submodule SDL3 added at b5c3eab

build-cmd.sh

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ else
1717
autobuild="$AUTOBUILD"
1818
fi
1919

20+
ls -l
21+
2022
TOP="$(dirname "$0")"
2123

2224
SDL_SOURCE_DIR="SDL2"
@@ -53,7 +55,9 @@ case "$AUTOBUILD_PLATFORM" in
5355

5456
mkdir -p "build_debug"
5557
pushd "build_debug"
56-
cmake .. -G "$AUTOBUILD_WIN_CMAKE_GEN" -A "$AUTOBUILD_WIN_VSPLATFORM" -DCMAKE_INSTALL_PREFIX=$(cygpath -m $stage)/debug
58+
cmake .. -G "$AUTOBUILD_WIN_CMAKE_GEN" -A "$AUTOBUILD_WIN_VSPLATFORM" \
59+
-DCMAKE_INSTALL_PREFIX=$(cygpath -m $stage)/debug \
60+
-DSDL3_INCLUDE_DIRS="$stage/../SDL3/include"
5761

5862
cmake --build . --config Debug
5963
cmake --install . --config Debug
@@ -69,7 +73,9 @@ case "$AUTOBUILD_PLATFORM" in
6973

7074
mkdir -p "build_release"
7175
pushd "build_release"
72-
cmake .. -G "$AUTOBUILD_WIN_CMAKE_GEN" -A "$AUTOBUILD_WIN_VSPLATFORM" -DCMAKE_INSTALL_PREFIX=$(cygpath -m $stage)/release
76+
cmake .. -G "$AUTOBUILD_WIN_CMAKE_GEN" -A "$AUTOBUILD_WIN_VSPLATFORM" \
77+
-DCMAKE_INSTALL_PREFIX=$(cygpath -m $stage)/release \
78+
-DSDL3_INCLUDE_DIRS="$stage/../SDL3/include"
7379

7480
cmake --build . --config Release
7581
cmake --install . --config Release
@@ -105,7 +111,8 @@ case "$AUTOBUILD_PLATFORM" in
105111
-DCMAKE_OSX_DEPLOYMENT_TARGET=${MACOSX_DEPLOYMENT_TARGET} \
106112
-DCMAKE_MACOSX_RPATH=YES \
107113
-DCMAKE_INSTALL_PREFIX="$stage" \
108-
-DCMAKE_INSTALL_LIBDIR="$stage/lib/release/$arch"
114+
-DCMAKE_INSTALL_LIBDIR="$stage/lib/release/$arch" \
115+
-DSDL3_INCLUDE_DIRS="$stage/../SDL3/include"
109116

110117
cmake --build . --config Release
111118
cmake --install . --config Release
@@ -139,7 +146,8 @@ case "$AUTOBUILD_PLATFORM" in
139146
cmake .. -GNinja -DCMAKE_BUILD_TYPE="Release" \
140147
-DCMAKE_C_FLAGS="$(remove_cxxstd $opts)" \
141148
-DCMAKE_CXX_FLAGS="$opts" \
142-
-DCMAKE_INSTALL_PREFIX=$PREFIX_RELEASE
149+
-DCMAKE_INSTALL_PREFIX=$PREFIX_RELEASE \
150+
-DSDL3_INCLUDE_DIRS="$stage/../SDL3/include"
143151

144152
cmake --build . --config Release
145153
cmake --install . --config Release

0 commit comments

Comments
 (0)