Permalink
Browse files

Updated Android compiling instructions now that dependencies and addi…

…tional version/lua steps are handled automatically by Gradle.
  • Loading branch information...
a1studmuffin committed Oct 17, 2018
1 parent eb049b8 commit 09d1e407d156e77f12b27e9d80c0c44ee178a7e6
Showing with 1 addition and 18 deletions.
  1. +1 −18 COMPILING.md
View
@@ -299,7 +299,7 @@ The Gradle project lives in the repository under `android/`. You can build it vi
* libintl-lite (tested with a custom fork of libintl-lite 0.5)
* lua (tested with lua 5.1.5)
Some dependencies need their entire source code copied under the Android project folder so they can be built for Android - see below.
The Gradle build process automatically installs dependencies from [deps.zip](android/app/deps.zip).
### Setup
@@ -325,23 +325,6 @@ Export Android environment variables (you can add these to the end of `~/.bashrc
export PATH=$PATH:$ANDROID_SDK_ROOT/tools
export PATH=$PATH:$ANDROID_NDK_ROOT
Install custom Android dependencies. Change directory to `Cataclysm-DDA` (the root folder of this repository) and run:
git clone https://github.com/a1studmuffin/SDL2 ./android/app/jni/SDL2
git clone https://github.com/a1studmuffin/lua ./android/app/jni/lua
git clone https://github.com/a1studmuffin/libintl-lite ./android/app/jni/libintl-lite
Install other Android dependencies SDL2_ttf, SDL2_mixer and SDL2_image. You may download the release ZIPs from from https://hg.libsdl.org/ and install them manually under `./android/app/jni/SDL2_xxx`, or clone latest dev with hg:
hg clone http://hg.libsdl.org/SDL_ttf ./android/app/jni/SDL2_ttf
hg clone http://hg.libsdl.org/SDL_mixer ./android/app/jni/SDL2_mixer
hg clone http://hg.libsdl.org/SDL_image ./android/app/jni/SDL2_image
Manually generate version and lua bindings:
make version
cd src/lua && lua generate_bindings.lua
### Android device setup
Enable [Developer options on your Android device](https://developer.android.com/studio/debug/dev-options). Connect your device to your PC via USB cable and run:

0 comments on commit 09d1e40

Please sign in to comment.