diff options
| author | Ray <raysan5@gmail.com> | 2016-02-20 01:09:47 +0100 |
|---|---|---|
| committer | Ray <raysan5@gmail.com> | 2016-02-20 01:09:47 +0100 |
| commit | 4b6e6d4dd45fc3a47b82af7eeb60871140a7eccf (patch) | |
| tree | d9ee679c3b0bc5d4a20b31930994deb0e4c37948 /src_android | |
| parent | f582ab06add085594f2579ee6e7d625212abd204 (diff) | |
| parent | 954ced21a42eb489ad382b4c00406a28778fee41 (diff) | |
| download | raylib-4b6e6d4dd45fc3a47b82af7eeb60871140a7eccf.tar.gz raylib-4b6e6d4dd45fc3a47b82af7eeb60871140a7eccf.zip | |
Merge pull request #83 from raysan5/develop
Develop branch integration
Diffstat (limited to 'src_android')
| -rw-r--r-- | src_android/AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src_android/jni/Android.mk | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src_android/AndroidManifest.xml b/src_android/AndroidManifest.xml index 6007eda3..8a940b24 100644 --- a/src_android/AndroidManifest.xml +++ b/src_android/AndroidManifest.xml @@ -12,7 +12,7 @@ android:versionCode="1" android:versionName="1.0" > - <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="17" /> + <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="19" /> <uses-feature android:glEsVersion="0x00020000" android:required="true" /> <application android:label="@string/app_name" android:icon="@drawable/icon" > diff --git a/src_android/jni/Android.mk b/src_android/jni/Android.mk index bd40d2aa..20073760 100644 --- a/src_android/jni/Android.mk +++ b/src_android/jni/Android.mk @@ -39,15 +39,14 @@ LOCAL_MODULE := raylib LOCAL_SRC_FILES :=\ ../../src/core.c \ ../../src/rlgl.c \ - ../../src/raymath.c \ ../../src/textures.c \ ../../src/text.c \ ../../src/shapes.c \ + ../../src/gestures.c \ ../../src/models.c \ ../../src/utils.c \ ../../src/audio.c \ ../../src/stb_vorbis.c \ - ../../src/gestures.c \ # Required includes paths (.h) LOCAL_C_INCLUDES := $(LOCAL_PATH) $(LOCAL_PATH)/include $(LOCAL_PATH)/../../src |