Skip to content

Commit 6904b06

Browse files
committed
Do not set C++ STL for pure C libs
1 parent 8b7ca05 commit 6904b06

5 files changed

Lines changed: 5 additions & 6 deletions

File tree

freetype.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ else
2727
-DHarfBuzz_INCLUDE_DIR=$ANDR_ROOT/output/harfbuzz/include/harfbuzz"
2828
fi
2929

30-
cmake .. -DANDROID_STL="c++_static" \
30+
cmake .. \
3131
-DANDROID_NATIVE_API_LEVEL="$NATIVE_API_LEVEL" \
3232
-DANDROID_ABI="$ANDROID_ABI" \
3333
-DANDROID_PLATFORM="$API" \

libjpeg.sh

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

1616
cd libjpeg-src/build
1717

18-
cmake .. -DANDROID_STL="c++_static" \
18+
cmake .. \
1919
-DANDROID_NATIVE_API_LEVEL="$NATIVE_API_LEVEL" \
2020
-DANDROID_ABI="$ANDROID_ABI" \
2121
-DANDROID_PLATFORM="$API" \

libpng.sh

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

18-
cmake .. -DANDROID_STL="c++_static" \
18+
cmake .. \
1919
-DANDROID_NATIVE_API_LEVEL="$NATIVE_API_LEVEL" \
2020
-DANDROID_ABI="$ANDROID_ABI" \
2121
-DANDROID_PLATFORM="$API" \

vorbis.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@ cd vorbis-src
1414
$ANDROID_NDK/ndk-build -j \
1515
APP_ABI="$TARGET_ABI" \
1616
APP_PLATFORM=android-"$API" \
17-
APP_CFLAGS="$CFLAGS" \
18-
APP_STL="c++_static"
17+
APP_CFLAGS="$CFLAGS"
1918

2019
# update headers
2120
rm -rf ../../output/vorbis/include/

zstd.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fi
1616
mkdir -p zstd-src/build/cmake/builddir
1717
cd zstd-src/build/cmake/builddir
1818

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

0 commit comments

Comments
 (0)