From bfda5808823b1b0624ce214cca3bef36d3ff7433 Mon Sep 17 00:00:00 2001 From: Romain Goyet Date: Wed, 27 Feb 2019 17:48:15 +0100 Subject: [PATCH] [ion/sdl] Add a build/targets file --- build/targets.sdl.android.mak | 33 +++++++++++++++++++++++++++++++++ build/targets.sdl.mak | 34 +--------------------------------- ion/src/sdl/android/Makefile | 11 +++++++++++ 3 files changed, 45 insertions(+), 33 deletions(-) create mode 100644 build/targets.sdl.android.mak create mode 100644 ion/src/sdl/android/Makefile diff --git a/build/targets.sdl.android.mak b/build/targets.sdl.android.mak new file mode 100644 index 000000000..a702ef525 --- /dev/null +++ b/build/targets.sdl.android.mak @@ -0,0 +1,33 @@ +# CAUTION: All the following builds have to happen in a sequential order so we +# cannot use standard Make dependencies +.PHONY: dependencies +dependencies: + rm -rf ion/src/sdl/android/com.numworks.calculator/app/libs + # First, build libsdl + cd $(SDL_PATH) && build-scripts/androidbuildlibs.sh + cp -r $(SDL_PATH)/build/android/lib ion/src/sdl/android/com.numworks.calculator/app/libs + # Then build epsilon for armv7 + rm -f ion/src/sdl/android/com.numworks.calculator/app/libs/armeabi-v7a/libepsilon.so + $(MAKE) ion/src/sdl/android/com.numworks.calculator/app/libs/armeabi-v7a/libepsilon.so + # Then for arm64 + rm -f ion/src/sdl/android/com.numworks.calculator/app/libs/arm64-v8a/libepsilon.so + $(MAKE) ion/src/sdl/android/com.numworks.calculator/app/libs/arm64-v8a/libepsilon.so + # Then for x86 + rm -f ion/src/sdl/android/com.numworks.calculator/app/libs/x86/libepsilon.so + $(MAKE) ion/src/sdl/android/com.numworks.calculator/app/libs/x86/libepsilon.so + # And eventually for x86_64 + rm -f ion/src/sdl/android/com.numworks.calculator/app/libs/x86_64/libepsilon.so + $(MAKE) ion/src/sdl/android/com.numworks.calculator/app/libs/x86_64/libepsilon.so + # Last but not least, copy the sources from SDL + cp -r $(SDL_PATH)/android-project/app/src/main/java/org ion/src/sdl/android/com.numworks.calculator/app/src/main/java + +epsilon.apk: + #rm ion/src/sdl/android/com.numworks.calculator/app/libs/arm64-v8a/libepsilon.so + #$(MAKE) ion/src/sdl/android/com.numworks.calculator/app/libs/arm64-v8a/libepsilon.so + cd ion/src/sdl/android/com.numworks.calculator ; ANDROID_HOME=/usr/local/android ./gradlew assembleRelease + cp ion/src/sdl/android/com.numworks.calculator/app/build/outputs/apk/release/app-release-unsigned.apk epsilon.apk + +epsilon_run: + #rm ion/src/sdl/android/com.numworks.calculator/app/libs/arm64-v8a/libepsilon.so + #$(MAKE) ion/src/sdl/android/com.numworks.calculator/app/libs/arm64-v8a/libepsilon.so + cd ion/src/sdl/android/com.numworks.calculator ; ANDROID_HOME=/usr/local/android ./gradlew installDebug diff --git a/build/targets.sdl.mak b/build/targets.sdl.mak index 2c81deee4..54afd6954 100644 --- a/build/targets.sdl.mak +++ b/build/targets.sdl.mak @@ -1,33 +1 @@ -# CAUTION: All the following builds have to happen in a sequential order so we -# cannot use standard Make dependencies -.PHONY: android-apk-dependencies -android-apk-dependencies: - rm -rf ion/src/sdl/android/com.numworks.calculator/app/libs - # First, build libsdl - cd $(SDL_PATH) && build-scripts/androidbuildlibs.sh - cp -r $(SDL_PATH)/build/android/lib ion/src/sdl/android/com.numworks.calculator/app/libs - # Then build epsilon for armv7 - rm -f ion/src/sdl/android/com.numworks.calculator/app/libs/armeabi-v7a/libepsilon.so - $(MAKE) ion/src/sdl/android/com.numworks.calculator/app/libs/armeabi-v7a/libepsilon.so - # Then for arm64 - rm -f ion/src/sdl/android/com.numworks.calculator/app/libs/arm64-v8a/libepsilon.so - $(MAKE) ion/src/sdl/android/com.numworks.calculator/app/libs/arm64-v8a/libepsilon.so - # Then for x86 - rm -f ion/src/sdl/android/com.numworks.calculator/app/libs/x86/libepsilon.so - $(MAKE) ion/src/sdl/android/com.numworks.calculator/app/libs/x86/libepsilon.so - # And eventually for x86_64 - rm -f ion/src/sdl/android/com.numworks.calculator/app/libs/x86_64/libepsilon.so - $(MAKE) ion/src/sdl/android/com.numworks.calculator/app/libs/x86_64/libepsilon.so - # Last but not least, copy the sources from SDL - cp -r $(SDL_PATH)/android-project/app/src/main/java/org ion/src/sdl/android/com.numworks.calculator/app/src/main/java - -epsilon.apk: - #rm ion/src/sdl/android/com.numworks.calculator/app/libs/arm64-v8a/libepsilon.so - #$(MAKE) ion/src/sdl/android/com.numworks.calculator/app/libs/arm64-v8a/libepsilon.so - cd ion/src/sdl/android/com.numworks.calculator ; ANDROID_HOME=/usr/local/android ./gradlew assembleRelease - cp ion/src/sdl/android/com.numworks.calculator/app/build/outputs/apk/release/app-release-unsigned.apk epsilon.apk - -epsilon_run: - #rm ion/src/sdl/android/com.numworks.calculator/app/libs/arm64-v8a/libepsilon.so - #$(MAKE) ion/src/sdl/android/com.numworks.calculator/app/libs/arm64-v8a/libepsilon.so - cd ion/src/sdl/android/com.numworks.calculator ; ANDROID_HOME=/usr/local/android ./gradlew installDebug +include build/targets.sdl.$(MODEL).mak diff --git a/ion/src/sdl/android/Makefile b/ion/src/sdl/android/Makefile new file mode 100644 index 000000000..8c140d7eb --- /dev/null +++ b/ion/src/sdl/android/Makefile @@ -0,0 +1,11 @@ +objs += $(addprefix ion/src/sdl/android/, \ + images.o \ +) + +ANDROID_LIB_PATH = ion/src/sdl/android/com.numworks.calculator/app/libs + +$(ANDROID_LIB_PATH)/%/libepsilon.so: +ion/src/sdl/android/com.numworks.calculator/app/libs/%/libepsilon.so: + $(Q) $(MAKE) MODEL=android NDK_ABI=$* clean + $(Q) $(MAKE) MODEL=android NDK_ABI=$* epsilon.so + $(Q) mv epsilon.so $@