diff options
| author | Ray <raysan5@gmail.com> | 2016-06-06 20:46:06 +0200 |
|---|---|---|
| committer | Ray <raysan5@gmail.com> | 2016-06-06 20:46:06 +0200 |
| commit | 1c98e6b698b8002e0c6c769c6d9f23a6e15f3bdf (patch) | |
| tree | 0aba231bb77034cae38dc44e39d53b63197c6a2c /templates/android_project | |
| parent | 75a73d94171051037fcf670852877977d9251520 (diff) | |
| parent | 4dada3269374a82fa2c4a06bd29dfc0f37a64380 (diff) | |
| download | raylib-1c98e6b698b8002e0c6c769c6d9f23a6e15f3bdf.tar.gz raylib-1c98e6b698b8002e0c6c769c6d9f23a6e15f3bdf.zip | |
Merge pull request #125 from raysan5/develop
Develop branch integration
Diffstat (limited to 'templates/android_project')
| -rw-r--r-- | templates/android_project/AndroidManifest.xml | 3 | ||||
| -rw-r--r-- | templates/android_project/jni/Android.mk | 4 | ||||
| -rw-r--r-- | templates/android_project/local.properties | 10 |
3 files changed, 3 insertions, 14 deletions
diff --git a/templates/android_project/AndroidManifest.xml b/templates/android_project/AndroidManifest.xml index f9f41b33..6755027e 100644 --- a/templates/android_project/AndroidManifest.xml +++ b/templates/android_project/AndroidManifest.xml @@ -29,8 +29,7 @@ <!-- android:theme="@android:style/Theme.NoTitleBar.Fullscreen" --> <!-- android:screenOrientation="portrait" --> <!-- Tell NativeActivity the name of our .so --> - <!--<meta-data android:name="android.app.lib_name" android:value="raylib_game" /> --> - <meta-data android:name="android.app.lib_name" android:value="@string/app_name" /> + <meta-data android:name="android.app.lib_name" android:value="raylib_game" /> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> diff --git a/templates/android_project/jni/Android.mk b/templates/android_project/jni/Android.mk index 424db553..fe4ba813 100644 --- a/templates/android_project/jni/Android.mk +++ b/templates/android_project/jni/Android.mk @@ -73,7 +73,7 @@ include $(PREBUILT_STATIC_LIBRARY) include $(CLEAR_VARS) # Module name -LOCAL_MODULE := raylibGame +LOCAL_MODULE := raylib_game # Module source files LOCAL_SRC_FILES := basic_game.c @@ -95,7 +95,7 @@ LOCAL_STATIC_LIBRARIES := android_native_app_glue raylib openal # NOTE: It brokes the build, using static library instead #LOCAL_SHARED_LIBRARIES := openal -# Build the shared library libraylibGame.so +# Build the shared library libraylib_game.so include $(BUILD_SHARED_LIBRARY) $(call import-module,android/native_app_glue) diff --git a/templates/android_project/local.properties b/templates/android_project/local.properties deleted file mode 100644 index f46293ea..00000000 --- a/templates/android_project/local.properties +++ /dev/null @@ -1,10 +0,0 @@ -# This file is automatically generated by Android Tools. -# Do not modify this file -- YOUR CHANGES WILL BE ERASED! -# -# This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. - -# location of the SDK. This is only used by Ant -# For customization when using a Version Control System, please read the -# header note. -sdk.dir=C:\\android-sdk |