Merge pull request #1283 from seanpaultaylor/next

Fixes android build and newproject scripts for copying the shader dir to...

gameplay/android/jni/Android.mk

@@ -282,8 +282,7 @@ LOCAL_SRC_FILES := \
     lua/lua_VertexFormat.cpp \
     lua/lua_VertexFormatElement.cpp \
     lua/lua_VertexFormatUsage.cpp \
-    lua/lua_VerticalLayout.cpp \
-    social/GooglePlaySocialSession.cpp
+    lua/lua_VerticalLayout.cpp
 
     
 LOCAL_CFLAGS := -D__ANDROID__ -DGP_USE_SOCIAL -I"../../external-deps/lua/include" -I"../../external-deps/bullet/include" -I"../../external-deps/png/include" -I"../../external-deps/oggvorbis/include" -I"../../external-deps/openal/include"

newproject.bat

@@ -212,6 +212,7 @@ call:replace "%projPath%\android\AndroidManifest.xml" TEMPLATE_UUID "%uuid%"
 
 copy template\android\template.build.xml "%projPath%\android\build.xml"
 call:replace "%projPath%\android\build.xml" TEMPLATE_PROJECT "%projName%"
+call:replace "%projPath%\android\build.xml" GAMEPLAY_PATH "%gpPath%"
 
 mkdir "%projPath%\android\jni"
 

newproject.sh

@@ -235,6 +235,7 @@ aliassedinplace "s*TEMPLATE_UUID*$uuid*g" "$projPath/android/AndroidManifest.xml
 
 cp "template/android/template.build.xml" "$projPath/android/build.xml"
 aliassedinplace "s*TEMPLATE_PROJECT*$projName*g" "$projPath/android/build.xml"
+aliassedinplace "s*GAMEPLAY_PATH*$gpPath*g" "$projPath/android/build.xml"
 
 cp "template/android/jni/Application.mk" "$projPath/android/jni/Application.mk"
 cp "template/android/jni/template.Android.mk" "$projPath/android/jni/Android.mk"

template/android/template.build.xml

@@ -66,6 +66,9 @@
         <copy todir="assets/res">
             <fileset dir="../res" />
         </copy>
+        <copy todir="assets/res/shaders">
+            <fileset dir="../GAMEPLAY_PATH/gameplay/res/shaders" />
+       </copy>
     </target>
 
     <!-- Import the actual build file.