From 78254d566c4d37c13f1cb579e33c393693b9f2b4 Mon Sep 17 00:00:00 2001
From: Maksym H <Maksym48@pm.me>
Date: Mon, 5 Dec 2022 18:52:43 +0200
Subject: [PATCH] Replace old *.mk

---
 Deps.mk     |  6 ------
 Irrlicht.mk |  8 --------
 irrlicht.sh | 16 ++++++++--------
 libpng.sh   |  2 +-
 vorbis.sh   |  7 ++++---
 5 files changed, 13 insertions(+), 26 deletions(-)
 delete mode 100755 Deps.mk
 delete mode 100755 Irrlicht.mk

diff --git a/Deps.mk b/Deps.mk
deleted file mode 100755
index 449ff0e..0000000
--- a/Deps.mk
+++ /dev/null
@@ -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}
diff --git a/Irrlicht.mk b/Irrlicht.mk
deleted file mode 100755
index 4b4e648..0000000
--- a/Irrlicht.mk
+++ /dev/null
@@ -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_
diff --git a/irrlicht.sh b/irrlicht.sh
index 70397cd..391ddd2 100755
--- a/irrlicht.sh
+++ b/irrlicht.sh
@@ -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
diff --git a/libpng.sh b/libpng.sh
index 75c08cd..e668acd 100755
--- a/libpng.sh
+++ b/libpng.sh
@@ -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
diff --git a/vorbis.sh b/vorbis.sh
index 9d54205..9d69b93 100755
--- a/vorbis.sh
+++ b/vorbis.sh
@@ -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/