Permalink
Please sign in to comment.
Browse files
Merge pull request #405 from dottools/PRfixAndroidStudioWin3
Fix compiling under Android Studio
- Loading branch information...
Showing
with
88 additions
and 59 deletions.
- +39 −14 engine/compilers/android-studio/app/app.iml
- +14 −14 engine/compilers/android-studio/app/build.gradle
- +2 −0 engine/compilers/android-studio/app/src/main/java/com/garagegames/torque2d/MyNativeActivity.java
- +2 −2 engine/compilers/android-studio/app/src/main/jni/Android.mk
- +1 −1 engine/compilers/android-studio/app/src/main/jni/Application.mk
- +1 −1 engine/compilers/android-studio/build.gradle
- +2 −2 engine/compilers/android-studio/gradle/wrapper/gradle-wrapper.properties
- +1 −1 engine/source/console/consoleDoc.cc
- +1 −1 engine/source/console/output_ScriptBinding.h
- +3 −3 engine/source/delegates/delegateSignal.h
- +2 −2 engine/source/graphics/dgl_ScriptBinding.h
- +2 −2 engine/source/platform/platformNet.cpp
- +2 −2 engine/source/platform/platformString.h
- +1 −1 engine/source/platformAndroid/AndroidInput.cpp
- +2 −2 engine/source/platformAndroid/AndroidStrings.cpp
- +1 −1 engine/source/platformAndroid/T2DActivity.cpp
- +2 −0 engine/source/platformAndroid/android_native_app_glue.c
- +2 −2 engine/source/platformEmscripten/EmscriptenStrings.cpp
- +2 −2 engine/source/platformOSX/osxString.mm
- +2 −2 engine/source/platformWin32/winStrings.cc
- +2 −2 engine/source/platformX86UNIX/x86UNIXStrings.cc
- +2 −2 engine/source/platformiOS/iOSStrings.mm
@@ -1,4 +1,4 @@ | |||
APP_PLATFORM := android-16 | |||
APP_STL := stlport_static | |||
APP_STL := c++_static | |||
APP_OPTIM := release | |||
APP_ABI := armeabi-v7a x86 x86_64 |
@@ -1,6 +1,6 @@ | |||
#Sat Aug 06 13:15:40 EDT 2016 | |||
#Sun Feb 04 22:37:25 CST 2018 | |||
distributionBase=GRADLE_USER_HOME | |||
distributionPath=wrapper/dists | |||
zipStoreBase=GRADLE_USER_HOME | |||
zipStorePath=wrapper/dists | |||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip | |||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip |

Oops, something went wrong.
0 comments on commit
1b16cbf