UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-03-18 21:30:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ion/sdl] Build from the shortened Android directory

Browse Source
This commit is contained in:
Romain Goyet
2019-02-27 22:18:24 +01:00
parent 8b27785a07
commit 9fc81d9a3f
4 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@@ -1,4 +1,7 @@
# Quiz output # Quiz output
quiz/src/symbols.c quiz/src/symbols.c
build # Ignore SDL files
ion/src/sdl/android/build
ion/src/sdl/android/libs
ion/src/sdl/android/src/java/org

28
build/targets.sdl.android.mak
View File

@@ -2,32 +2,32 @@
# cannot use standard Make dependencies # cannot use standard Make dependencies
.PHONY: dependencies .PHONY: dependencies
dependencies: dependencies:
rm -rf ion/src/sdl/android/com.numworks.calculator/app/libs rm -rf ion/src/sdl/android/libs
# First, build libsdl # First, build libsdl
cd $(SDL_PATH) && build-scripts/androidbuildlibs.sh cd $(SDL_PATH) && build-scripts/androidbuildlibs.sh
cp -r $(SDL_PATH)/build/android/lib ion/src/sdl/android/com.numworks.calculator/app/libs cp -r $(SDL_PATH)/build/android/lib ion/src/sdl/android/libs
# Then build epsilon for armv7 # Then build epsilon for armv7
rm -f ion/src/sdl/android/com.numworks.calculator/app/libs/armeabi-v7a/libepsilon.so rm -f ion/src/sdl/android/libs/armeabi-v7a/libepsilon.so
$(MAKE) ion/src/sdl/android/com.numworks.calculator/app/libs/armeabi-v7a/libepsilon.so $(MAKE) ion/src/sdl/android/libs/armeabi-v7a/libepsilon.so
# Then for arm64 # Then for arm64
rm -f ion/src/sdl/android/com.numworks.calculator/app/libs/arm64-v8a/libepsilon.so rm -f ion/src/sdl/android/libs/arm64-v8a/libepsilon.so
$(MAKE) ion/src/sdl/android/com.numworks.calculator/app/libs/arm64-v8a/libepsilon.so $(MAKE) ion/src/sdl/android/libs/arm64-v8a/libepsilon.so
# Then for x86 # Then for x86
rm -f ion/src/sdl/android/com.numworks.calculator/app/libs/x86/libepsilon.so rm -f ion/src/sdl/android/libs/x86/libepsilon.so
$(MAKE) ion/src/sdl/android/com.numworks.calculator/app/libs/x86/libepsilon.so $(MAKE) ion/src/sdl/android/libs/x86/libepsilon.so
# And eventually for x86_64 # And eventually for x86_64
rm -f ion/src/sdl/android/com.numworks.calculator/app/libs/x86_64/libepsilon.so rm -f ion/src/sdl/android/libs/x86_64/libepsilon.so
$(MAKE) ion/src/sdl/android/com.numworks.calculator/app/libs/x86_64/libepsilon.so $(MAKE) ion/src/sdl/android/libs/x86_64/libepsilon.so
# Last but not least, copy the sources from SDL # 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 cp -r $(SDL_PATH)/android-project/app/src/main/java/org ion/src/sdl/android/src/java
epsilon.apk: epsilon.apk:
#rm ion/src/sdl/android/com.numworks.calculator/app/libs/arm64-v8a/libepsilon.so #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 #$(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 cd ion/src/sdl/android ; ANDROID_HOME=/usr/local/android gradle assembleRelease
cp ion/src/sdl/android/com.numworks.calculator/app/build/outputs/apk/release/app-release-unsigned.apk epsilon.apk cp ion/src/sdl/android/build/outputs/apk/release/app-release-unsigned.apk epsilon.apk
epsilon_run: epsilon_run:
#rm ion/src/sdl/android/com.numworks.calculator/app/libs/arm64-v8a/libepsilon.so #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 #$(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 cd ion/src/sdl/android ; ANDROID_HOME=/usr/local/android gradle installDebug

6
ion/src/sdl/android/Makefile
View File

@@ -1,11 +1,11 @@
objs += $(addprefix ion/src/sdl/android/, \ objs += $(addprefix ion/src/sdl/android/src/cpp/, \
images.o \ images.o \
) )
ANDROID_LIB_PATH = ion/src/sdl/android/com.numworks.calculator/app/libs ANDROID_LIB_PATH = ion/src/sdl/android/libs
$(ANDROID_LIB_PATH)/%/libepsilon.so: $(ANDROID_LIB_PATH)/%/libepsilon.so:
ion/src/sdl/android/com.numworks.calculator/app/libs/%/libepsilon.so: ion/src/sdl/android/libs/%/libepsilon.so:
$(Q) $(MAKE) MODEL=android NDK_ABI=$* clean $(Q) $(MAKE) MODEL=android NDK_ABI=$* clean
$(Q) $(MAKE) MODEL=android NDK_ABI=$* epsilon.so $(Q) $(MAKE) MODEL=android NDK_ABI=$* epsilon.so
$(Q) mv epsilon.so $@ $(Q) mv epsilon.so $@

2
ion/src/sdl/android/build.gradle
View File

@@ -40,7 +40,7 @@ android {
res.srcDir 'src/res' res.srcDir 'src/res'
java.srcDir 'src' java.srcDir 'src'
jniLibs.srcDir 'libs' jniLibs.srcDir 'libs'
assets.srcDir '../../../assets' assets.srcDir '../assets'
} }
} }