diff options
| author | victorfisac <victorfisac@gmail.com> | 2016-05-20 14:03:23 +0200 |
|---|---|---|
| committer | victorfisac <victorfisac@gmail.com> | 2016-05-20 14:03:23 +0200 |
| commit | 4f1bee31654dec5f5cea2ac9d291d202df504745 (patch) | |
| tree | 42a5028ebab3277a8d46bdcf3fea2990e1aa590d /templates/android_project | |
| parent | ea7afc8ec835040d84d79ae318f7aebb9f1e189c (diff) | |
| parent | dcf5f45f687f2a534286aecd5e6471a0440b0c21 (diff) | |
| download | raylib-4f1bee31654dec5f5cea2ac9d291d202df504745.tar.gz raylib-4f1bee31654dec5f5cea2ac9d291d202df504745.zip | |
Merge remote-tracking branch 'refs/remotes/raysan5/develop' into develop
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 |
2 files changed, 3 insertions, 4 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) |