ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update android with latest libjpeg, libpng and zlib and remove bundled libraries

Browse Source
This commit is contained in:
Benau
2020-05-14 10:13:57 +08:00
parent 52cf0f16d1
commit 6d30bb8f05
459 changed files with 22 additions and 254484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
android/Android.mk
View File

@@ -52,8 +52,8 @@ include $(CLEAR_VARS)
# JPEG
LOCAL_MODULE := jpeglib
LOCAL_SRC_FILES := obj/jpeglib/libjpeglib.a
LOCAL_MODULE := libjpeg
LOCAL_SRC_FILES := obj/libjpeg/libjpeg.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
@@ -180,13 +180,13 @@ LOCAL_SRC_FILES := $(wildcard ../lib/irrlicht/source/Irrlicht/*.cpp)
LOCAL_CFLAGS := -I../lib/irrlicht/source/Irrlicht/ \
-I../lib/irrlicht/include/ \
-I../src \
-Iobj/jpeglib/ \
-Iobj/libjpeg/ \
-Iobj/libpng/ \
-Iobj/zlib/ \
-I../lib/sdl2/include/ \
-DANDROID_PACKAGE_CALLBACK_NAME=$(PACKAGE_CALLBACK_NAME)
LOCAL_CPPFLAGS := -std=gnu++0x
LOCAL_STATIC_LIBRARIES := jpeglib png zlib
LOCAL_STATIC_LIBRARIES := libjpeg png zlib
include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
@@ -245,7 +245,7 @@ LOCAL_CPP_FEATURES += rtti exceptions
LOCAL_SRC_FILES := $(wildcard ../src/*.cpp) \
$(wildcard ../src/*/*.cpp) \
$(wildcard ../src/*/*/*.cpp)
LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv1_CM -lGLESv3 -lOpenSLES -ldl
LOCAL_LDLIBS := -llog -landroid -lEGL -lGLESv1_CM -lGLESv3 -lOpenSLES -ldl -lm
LOCAL_CFLAGS := -I../lib/angelscript/include \
-I../lib/bullet/src \
-I../lib/libraqm \

23
android/make.sh
View File

@@ -297,7 +297,7 @@ if [ ! -f "$DIRNAME/obj/zlib.stamp" ]; then
cd "$DIRNAME/obj/zlib"
cmake . -DCMAKE_TOOLCHAIN_FILE=../../../cmake/Toolchain-android.cmake \
-DHOST=$HOST -DCMAKE_C_FLAGS="-fpic" &&
-DHOST=$HOST -DARCH=$ARCH -DCMAKE_C_FLAGS="-fpic" &&
make $@
check_error
touch "$DIRNAME/obj/zlib.stamp"
@@ -312,9 +312,10 @@ if [ ! -f "$DIRNAME/obj/libpng.stamp" ]; then
cd "$DIRNAME/obj/libpng"
cmake . -DCMAKE_TOOLCHAIN_FILE=../../../cmake/Toolchain-android.cmake \
-DHOST=$HOST \
-DHOST=$HOST -DARCH=$ARCH \
-DZLIB_LIBRARY="$DIRNAME/obj/zlib/libz.a" \
-DZLIB_INCLUDE_DIR="$DIRNAME/obj/zlib/" \
-DM_LIBRARY="$DIRNAME/obj/sysroot/usr/lib/$HOST/libm.a" \
-DPNG_TESTS=0 -DCMAKE_C_FLAGS="-fpic" &&
make $@
check_error
@@ -396,7 +397,7 @@ if [ ! -f "$DIRNAME/obj/openal.stamp" ]; then
cd "$DIRNAME/obj/openal"
cmake . -DCMAKE_TOOLCHAIN_FILE=../../../cmake/Toolchain-android.cmake \
-DHOST=$HOST \
-DHOST=$HOST -DARCH=$ARCH \
-DALSOFT_UTILS=0 \
-DALSOFT_EXAMPLES=0 \
-DALSOFT_TESTS=0 \
@@ -440,18 +441,18 @@ if [ ! -f "$DIRNAME/obj/curl.stamp" ]; then
touch "$DIRNAME/obj/curl.stamp"
fi
# Jpeglib
if [ ! -f "$DIRNAME/obj/jpeglib.stamp" ]; then
echo "Compiling jpeglib"
mkdir -p "$DIRNAME/obj/jpeglib"
cp -a -f "$DIRNAME/../lib/jpeglib/"* "$DIRNAME/obj/jpeglib"
# Libjpeg
if [ ! -f "$DIRNAME/obj/libjpeg.stamp" ]; then
echo "Compiling libjpeg"
mkdir -p "$DIRNAME/obj/libjpeg"
cp -a -f "$DIRNAME/../lib/libjpeg/"* "$DIRNAME/obj/libjpeg"
cd "$DIRNAME/obj/jpeglib"
cd "$DIRNAME/obj/libjpeg"
cmake . -DCMAKE_TOOLCHAIN_FILE=../../../cmake/Toolchain-android.cmake \
-DHOST=$HOST -DCMAKE_C_FLAGS="-fpic" &&
-DHOST=$HOST -DARCH=$ARCH -DCMAKE_C_FLAGS="-fpic" &&
make $@
check_error
touch "$DIRNAME/obj/jpeglib.stamp"
touch "$DIRNAME/obj/libjpeg.stamp"
fi
# Libogg