Skip to content

Commit 799e14b

Browse files
committed
Bump libcurl, libjpeg, mbedtls and SDL2
1 parent 3baa9c9 commit 799e14b

File tree

6 files changed

+12
-9
lines changed

6 files changed

+12
-9
lines changed

SDL2.sh

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

3-
SDL2_VERSION=2.30.2
3+
SDL2_VERSION=2.30.3
44

55
. sdk.sh
66

Start.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ fi
3939

4040
# Build libs
4141

42-
sh freetype.sh
4342
sh gettext.sh
4443
sh leveldb.sh
4544
#sh luajit.sh
4645
sh libjpeg.sh
4746
sh libpng.sh
47+
sh freetype.sh
4848
sh SDL2.sh
4949
sh irrlicht.sh
5050
sh openal.sh

freetype.sh

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,12 @@ cmake .. -DANDROID_STL="c++_static" -DANDROID_NATIVE_API_LEVEL="$NATIVE_API_LEVE
2121
-DCMAKE_BUILD_TYPE=Release \
2222
-DBUILD_SHARED_LIBS=FALSE \
2323
-DFT_DISABLE_BZIP2=TRUE \
24-
-DFT_DISABLE_PNG=TRUE \
2524
-DFT_DISABLE_HARFBUZZ=TRUE \
2625
-DFT_DISABLE_BROTLI=TRUE \
26+
-DFT_REQUIRE_PNG=TRUE \
27+
-DFT_REQUIRE_ZLIB=TRUE \
28+
-DPNG_LIBRARY="$ANDR_ROOT/output/libpng/lib/$TARGET_ABI/libpng.a" \
29+
-DPNG_PNG_INCLUDE_DIR="$ANDR_ROOT/output/libpng/include" \
2730
-DANDROID_ABI="$ANDROID_ABI" \
2831
-DANDROID_PLATFORM="$API" \
2932
-DCMAKE_C_FLAGS_RELEASE="$CFLAGS" \

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.7.1
4+
CURL_VERSION=8.8.0
55

66
export ANDR_ROOT=$(pwd)
77

libjpeg.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-
JPEG_VERSION=3.0.2
4+
JPEG_VERSION=3.0.3
55

66
mkdir -p output/libjpeg/lib/$TARGET_ABI
77
mkdir -p deps; cd deps

mbedtls.sh

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

33
. sdk.sh
4-
MBEDTLS_VERSION=3.5.2
4+
MBEDTLS_VERSION=3.6.0
55

66
mkdir -p output/mbedtls/lib/$TARGET_ABI
77
mkdir -p deps; cd deps
88

99
if [ ! -d mbedtls-src ]; then
10-
wget https://github.com/Mbed-TLS/mbedtls/archive/refs/tags/v$MBEDTLS_VERSION.tar.gz
11-
tar -xzf v$MBEDTLS_VERSION.tar.gz
10+
wget https://github.com/Mbed-TLS/mbedtls/releases/download/v$MBEDTLS_VERSION/mbedtls-$MBEDTLS_VERSION.tar.bz2
11+
tar -xzf mbedtls-$MBEDTLS_VERSION.tar.bz2
1212
mv mbedtls-$MBEDTLS_VERSION mbedtls-src
13-
rm v$MBEDTLS_VERSION.tar.gz
13+
rm mbedtls-$MBEDTLS_VERSION.tar.bz2
1414
mkdir mbedtls-src/build
1515
fi
1616

0 commit comments

Comments
 (0)