From 268d8dbb93793e59fc9ea399dada9766dfd91471 Mon Sep 17 00:00:00 2001
From: saschawillems <webmaster@saschawillems.de>
Date: Fri, 25 Mar 2016 16:41:44 +0100
Subject: [PATCH] Android builds (#97)

---
 android/build-all.bat                   | 17 +++++++++++++++++
 android/vulkanscene/AndroidManifest.xml |  6 +++---
 android/vulkanscene/build.bat           |  2 +-
 android/vulkanscene/jni/Android.mk      |  2 +-
 4 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 android/build-all.bat

diff --git a/android/build-all.bat b/android/build-all.bat
new file mode 100644
index 00000000..f2f78383
--- /dev/null
+++ b/android/build-all.bat
@@ -0,0 +1,17 @@
+call build-bloom.bat %1
+call build-computeparticles.bat %1
+call build-computeshader.bat %1
+call build-deferred.bat %1
+call build-displacement.bat %1
+rem call build-distancefieldfonts.bat
+call build-mesh.bat %1
+call build-offscreen.bat %1
+call build-particlefire.bat %1
+call build-shadowmapping.bat %1
+call build-shadowmappingomni.bat %1
+call build-sphericalenvmapping.bat %1
+call build-texture.bat %1
+call build-texturearray.bat %1
+call build-texturecubemap.bat %1
+call build-triangle.bat %1
+call build-vulkanscene.bat %1
\ No newline at end of file
diff --git a/android/vulkanscene/AndroidManifest.xml b/android/vulkanscene/AndroidManifest.xml
index d32def6c..ef74dfef 100644
--- a/android/vulkanscene/AndroidManifest.xml
+++ b/android/vulkanscene/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" 
-		package="de.saschawillems.vulkanScene"
+		package="de.saschawillems.vulkanVulkanscene"
         android:versionCode="1"
         android:versionName="1.0">
 		
@@ -10,13 +10,13 @@
     <uses-feature android:name="android.hardware.gamepad" android:required="false"/>
     <uses-feature android:name="android.software.leanback" android:required="false"/>  	
 	
-    <application android:label="vulkanScene" android:icon="@drawable/icon" android:hasCode="false">
+    <application android:label="vulkanVulkanscene" android:icon="@drawable/icon" android:hasCode="false">
 		<activity android:name="android.app.NativeActivity"
                 android:label="Demo Scene"
                 android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				android:launchMode="singleTask"
                 android:configChanges="orientation|screenSize|keyboardHidden">
-			<meta-data android:name="android.app.lib_name" android:value="vulkanScene" />
+			<meta-data android:name="android.app.lib_name" android:value="vulkanVulkanscene" />
 			<intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/android/vulkanscene/build.bat b/android/vulkanscene/build.bat
index 9353c7c0..92a916dd 100644
--- a/android/vulkanscene/build.bat
+++ b/android/vulkanscene/build.bat
@@ -19,7 +19,7 @@ if %ERRORLEVEL% EQU 0 (
 	mkdir "res\drawable"
 	xcopy "..\..\android\images\icon.png" "res\drawable" /Y
 
-	call ant debug -Dout.final.file=vulkanScene.apk
+	call ant debug -Dout.final.file=vulkanVulkanscene.apk
 ) ELSE (
 	echo error : ndk-build failed with errors!
 	cd..
diff --git a/android/vulkanscene/jni/Android.mk b/android/vulkanscene/jni/Android.mk
index 57317328..6f4feab2 100644
--- a/android/vulkanscene/jni/Android.mk
+++ b/android/vulkanscene/jni/Android.mk
@@ -14,7 +14,7 @@ DATADIR := $(LOCAL_PATH)/../../data
 
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := vulkanScene
+LOCAL_MODULE := vulkanVulkanscene
 
 PROJECT_FILES := $(wildcard $(LOCAL_PATH)/../../vulkanscene/*.cpp)
 PROJECT_FILES += $(wildcard $(LOCAL_PATH)/../../base/*.cpp)