Replace old *.mk

main 05122022
Maksym H 2022-12-05 18:52:43 +02:00
parent 2fa57e0805
commit 78254d566c
5 changed files with 13 additions and 26 deletions

View File

@ -1,6 +0,0 @@
APP_PLATFORM := ${APP_PLATFORM}
APP_ABI := ${TARGET_ABI}
APP_STL := ${APP_STL}
NDK_TOOLCHAIN_VERSION := ${COMPILER_VERSION}
APP_CFLAGS := ${TARGET_CXXFLAGS_ADDON}

View File

@ -1,8 +0,0 @@
APP_PLATFORM := ${APP_PLATFORM}
APP_ABI := ${TARGET_ABI}
APP_STL := ${APP_STL}
APP_MODULES := Irrlicht
APP_CFLAGS := ${TARGET_CFLAGS_ADDON}
APP_CXXFLAGS := ${TARGET_CPPFLAGS_ADDON} -std=gnu++17
APP_CPPFLAGS := ${TARGET_CPPFLAGS_ADDON} -DNO_IRR_COMPILE_WITH_SDL_TEXTINPUT_

View File

@ -6,19 +6,19 @@ mkdir -p output/irrlicht/lib/$TARGET_ABI
mkdir -p deps; cd deps
[ ! -d irrlicht-src ] && \
git clone --depth 1 -b SDL2 https://github.com/MoNTE48/Irrlicht irrlicht-src
git clone --depth 1 -b SDL2 https://github.com/MoNTE48/Irrlicht irrlicht-src
cd irrlicht-src/source/Irrlicht/Android-SDL2
export SDL2_PATH="$OUTPUT_PATH/sdl2/"
$ANDROID_NDK/ndk-build -j \
NDEBUG=1 \
APP_PLATFORM=android-"$API" \
TARGET_ABI="$TARGET_ABI" \
APP_STL="c++_static" \
NDK_APPLICATION_MK="$ANDR_ROOT/Irrlicht.mk" \
TARGET_CFLAGS_ADDON="${TARGET_CFLAGS_ADDON}" \
TARGET_CPPFLAGS_ADDON="${TARGET_CXXFLAGS_ADDON} -I$OUTPUT_PATH/libjpeg/include -I$OUTPUT_PATH/libpng/include"
NDEBUG=1 \
APP_ABI="$TARGET_ABI" \
APP_PLATFORM=android-"$API" \
APP_CFLAGS="$CFLAGS" \
APP_CXXFLAGS="$CXXFLAGS -std=gnu++17" \
APP_CPPFLAGS="$APP_CXXFLAGS -DNO_IRR_COMPILE_WITH_SDL_TEXTINPUT_ -I$OUTPUT_PATH/libjpeg/include -I$OUTPUT_PATH/libpng/include" \
APP_STL="c++_static"
# update `include` folder
rm -rf ../../../../../output/irrlicht/include

View File

@ -1,7 +1,7 @@
#!/bin/bash -e
. sdk.sh
PNG_VERSION=1.6.38
PNG_VERSION=1.6.39
mkdir -p output/libpng/lib/$TARGET_ABI
mkdir -p deps; cd deps

View File

@ -13,10 +13,11 @@ fi
cd vorbis-src
$ANDROID_NDK/ndk-build \
$ANDROID_NDK/ndk-build -j \
APP_ABI="$TARGET_ABI" \
APP_PLATFORM=android-"$API" \
TARGET_ABI="$TARGET_ABI" \
NDK_APPLICATION_MK="$ANDR_ROOT/Deps.mk"
APP_CFLAGS="$CFLAGS" \
APP_STL="c++_static"
# update `include` folder
rm -rf ../../output/vorbis/include/