Skip to content

Commit ec6cb85

Browse files
committed
Bump Curl and libSDL3
1 parent cf35898 commit ec6cb85

File tree

6 files changed

+30
-20
lines changed

6 files changed

+30
-20
lines changed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
## Dependencies for the MultiCraft (Android)
22

3-
Copyright © 2021-2025 Maksim Gamarnik [MoNTE48] <[email protected]>
3+
Copyright © 2021-2025 Maksym Hamarnyk [MoNTE48] <[email protected]>
44

5-
Licensed to libraries under the license of their authors.
5+
License of libraries under the license of their authors.
66

7-
License for this bash scripts: CC0.
7+
License for this bash scripts: CC0 1.0.

freetype.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fi
1818

1919
cd freetype-src/build
2020

21-
cmake .. -DANDROID_STL="c++_static" \
21+
cmake .. -DANDROID_STL="c++_static" \
2222
-DANDROID_NATIVE_API_LEVEL="$NATIVE_API_LEVEL" \
2323
-DANDROID_ABI="$ANDROID_ABI" \
2424
-DANDROID_PLATFORM="$API" \

libSDL.sh

Lines changed: 23 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
#!/bin/bash -e
22

3-
SDL_VERSION=3.2.22
3+
SDL_VERSION=3.2.24
44

55
. ./sdk.sh
66

77
mkdir -p output/libSDL/lib/$TARGET_ABI
88
mkdir -p deps; cd deps
99

1010
if [ ! -d libSDL-src ]; then
11-
if [ ! -f "release-$SDL_VERSION.tar.gz" ]; then
12-
wget https://github.com/libsdl-org/SDL/archive/release-$SDL_VERSION.tar.gz
13-
fi
11+
if [ ! -f "release-$SDL_VERSION.tar.gz" ]; then
12+
wget https://github.com/libsdl-org/SDL/archive/release-$SDL_VERSION.tar.gz
13+
fi
1414
tar -xzf release-$SDL_VERSION.tar.gz
1515
mv SDL-release-$SDL_VERSION libSDL-src
1616
fi
@@ -20,15 +20,25 @@ cd libSDL-src
2020
mkdir -p build; cd build
2121

2222
cmake .. -DANDROID_STL="c++_static" \
23-
-DANDROID_NATIVE_API_LEVEL="$NATIVE_API_LEVEL" \
24-
-DANDROID_ABI="$ANDROID_ABI" \
25-
-DANDROID_PLATFORM="$API" \
26-
-DCMAKE_BUILD_TYPE=Release \
27-
-DCMAKE_C_FLAGS="$CFLAGS" \
28-
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
29-
-DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake" \
30-
-DSDL_STATIC=1 \
31-
-DSDL_SHARED=0
23+
-DANDROID_NATIVE_API_LEVEL="$NATIVE_API_LEVEL" \
24+
-DANDROID_ABI="$ANDROID_ABI" \
25+
-DANDROID_PLATFORM="$API" \
26+
-DCMAKE_BUILD_TYPE=Release \
27+
-DCMAKE_C_FLAGS="$CFLAGS" \
28+
-DCMAKE_CXX_FLAGS="$CXXFLAGS" \
29+
-DCMAKE_TOOLCHAIN_FILE="$ANDROID_NDK/build/cmake/android.toolchain.cmake" \
30+
-DSDL_STATIC=1 \
31+
-DSDL_SHARED=0 \
32+
-DSDL_AUDIO=OFF \
33+
-DSDL_RENDER=OFF \
34+
-DSDL_CAMERA=OFF \
35+
-DSDL_METAL=OFF \
36+
-DSDL_GPU=OFF \
37+
-DSDL_HAPTIC=OFF \
38+
-DSDL_POWER=OFF \
39+
-DSDL_DIALOG=OFF \
40+
-DSDL_TESTS=OFF \
41+
-DSDL_EXAMPLES=OFF
3242

3343
cmake --build . -j
3444

libcurl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash -e
22

33
. ./sdk.sh
4-
CURL_VERSION=8.15.0
4+
CURL_VERSION=8.16.0
55

66
export ANDR_ROOT=$(pwd)
77

libjpeg.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fi
1717

1818
cd libjpeg-src/build
1919

20-
cmake .. -DANDROID_STL="c++_static" \
20+
cmake .. -DANDROID_STL="c++_static" \
2121
-DANDROID_NATIVE_API_LEVEL="$NATIVE_API_LEVEL" \
2222
-DANDROID_ABI="$ANDROID_ABI" \
2323
-DANDROID_PLATFORM="$API" \

libpng.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fi
1717
mkdir -p libpng-src/build
1818
cd libpng-src/build
1919

20-
cmake .. -DANDROID_STL="c++_static" \
20+
cmake .. -DANDROID_STL="c++_static" \
2121
-DANDROID_NATIVE_API_LEVEL="$NATIVE_API_LEVEL" \
2222
-DANDROID_ABI="$ANDROID_ABI" \
2323
-DANDROID_PLATFORM="$API" \

0 commit comments

Comments
 (0)