Updated Android makefiles.

gameplay/android/jni/Android.mk

@@ -89,6 +89,7 @@ LOCAL_SRC_FILES := \
     Scene.cpp \
     SceneLoader.cpp \
     ScreenDisplayer.cpp \
+    Script.cpp \
     ScriptController.cpp \
     ScriptTarget.cpp \
     Slider.cpp \
@@ -112,7 +113,6 @@ LOCAL_SRC_FILES := \
     lua/lua_AIAgentListener.cpp \
     lua/lua_AIController.cpp \
     lua/lua_AIMessage.cpp \
-    lua/lua_AIMessageParameterType.cpp \
     lua/lua_AIState.cpp \
     lua/lua_AIStateListener.cpp \
     lua/lua_AIStateMachine.cpp \
@@ -120,7 +120,6 @@ LOCAL_SRC_FILES := \
     lua/lua_Animation.cpp \
     lua/lua_AnimationClip.cpp \
     lua/lua_AnimationClipListener.cpp \
-    lua/lua_AnimationClipListenerEventType.cpp \
     lua/lua_AnimationController.cpp \
     lua/lua_AnimationTarget.cpp \
     lua/lua_AnimationValue.cpp \
@@ -128,98 +127,65 @@ LOCAL_SRC_FILES := \
     lua/lua_AudioController.cpp \
     lua/lua_AudioListener.cpp \
     lua/lua_AudioSource.cpp \
-    lua/lua_AudioSourceState.cpp \
     lua/lua_BoundingBox.cpp \
     lua/lua_BoundingSphere.cpp \
     lua/lua_Bundle.cpp \
     lua/lua_Button.cpp \
     lua/lua_Camera.cpp \
     lua/lua_CameraListener.cpp \
-    lua/lua_CameraType.cpp \
     lua/lua_CheckBox.cpp \
     lua/lua_Container.cpp \
-    lua/lua_ContainerDirection.cpp \
-    lua/lua_ContainerScroll.cpp \
     lua/lua_Control.cpp \
-    lua/lua_ControlAlignment.cpp \
-    lua/lua_ControlAutoSize.cpp \
     lua/lua_ControlListener.cpp \
-    lua/lua_ControlListenerEventType.cpp \
-    lua/lua_ControlState.cpp \
     lua/lua_Curve.cpp \
-    lua/lua_CurveInterpolationType.cpp \
     lua/lua_DepthStencilTarget.cpp \
-    lua/lua_DepthStencilTargetFormat.cpp \
     lua/lua_Effect.cpp \
     lua/lua_FileSystem.cpp \
     lua/lua_FlowLayout.cpp \
     lua/lua_Font.cpp \
-    lua/lua_FontFormat.cpp \
-    lua/lua_FontJustify.cpp \
-    lua/lua_FontStyle.cpp \
     lua/lua_FontText.cpp \
     lua/lua_Form.cpp \
     lua/lua_FrameBuffer.cpp \
     lua/lua_Frustum.cpp \
     lua/lua_Game.cpp \
-    lua/lua_GameClearFlags.cpp \
     lua/lua_Gamepad.cpp \
-    lua/lua_GamepadButtonMapping.cpp \
-    lua/lua_GamepadGamepadEvent.cpp \
-    lua/lua_GameState.cpp \
     lua/lua_Gesture.cpp \
-    lua/lua_GestureGestureEvent.cpp \
     lua/lua_Global.cpp \
     lua/lua_HeightField.cpp \
     lua/lua_Image.cpp \
     lua/lua_ImageControl.cpp \
-    lua/lua_ImageFormat.cpp \
     lua/lua_Joint.cpp \
     lua/lua_JoystickControl.cpp \
     lua/lua_Keyboard.cpp \
-    lua/lua_KeyboardKey.cpp \
-    lua/lua_KeyboardKeyEvent.cpp \
     lua/lua_Label.cpp \
     lua/lua_Layout.cpp \
-    lua/lua_LayoutType.cpp \
     lua/lua_Light.cpp \
-    lua/lua_LightType.cpp \
     lua/lua_Logger.cpp \
-    lua/lua_LoggerLevel.cpp \
     lua/lua_Material.cpp \
     lua/lua_MaterialParameter.cpp \
     lua/lua_MathUtil.cpp \
     lua/lua_Matrix.cpp \
     lua/lua_Mesh.cpp \
     lua/lua_MeshBatch.cpp \
-    lua/lua_MeshIndexFormat.cpp \
     lua/lua_MeshPart.cpp \
-    lua/lua_MeshPrimitiveType.cpp \
     lua/lua_MeshSkin.cpp \
     lua/lua_Model.cpp \
     lua/lua_Mouse.cpp \
-    lua/lua_MouseMouseEvent.cpp \
     lua/lua_Node.cpp \
     lua/lua_NodeCloneContext.cpp \
-    lua/lua_NodeType.cpp \
     lua/lua_ParticleEmitter.cpp \
-    lua/lua_ParticleEmitterTextureBlending.cpp \
     lua/lua_Pass.cpp \
     lua/lua_PhysicsCharacter.cpp \
     lua/lua_PhysicsCollisionObject.cpp \
     lua/lua_PhysicsCollisionObjectCollisionListener.cpp \
-    lua/lua_PhysicsCollisionObjectCollisionListenerEventType.cpp \
     lua/lua_PhysicsCollisionObjectCollisionPair.cpp \
-    lua/lua_PhysicsCollisionObjectType.cpp \
     lua/lua_PhysicsCollisionShape.cpp \
     lua/lua_PhysicsCollisionShapeDefinition.cpp \
-    lua/lua_PhysicsCollisionShapeType.cpp \
     lua/lua_PhysicsConstraint.cpp \
     lua/lua_PhysicsController.cpp \
     lua/lua_PhysicsControllerHitFilter.cpp \
     lua/lua_PhysicsControllerHitResult.cpp \
     lua/lua_PhysicsControllerListener.cpp \
-    lua/lua_PhysicsControllerListenerEventType.cpp \
     lua/lua_PhysicsFixedConstraint.cpp \
     lua/lua_PhysicsGenericConstraint.cpp \
     lua/lua_PhysicsGhostObject.cpp \
@@ -233,46 +199,35 @@ LOCAL_SRC_FILES := \
     lua/lua_Plane.cpp \
     lua/lua_Platform.cpp \
     lua/lua_Properties.cpp \
-    lua/lua_PropertiesType.cpp \
     lua/lua_Quaternion.cpp \
     lua/lua_RadioButton.cpp \
     lua/lua_Ray.cpp \
     lua/lua_Rectangle.cpp \
     lua/lua_Ref.cpp \
     lua/lua_RenderState.cpp \
-    lua/lua_RenderStateAutoBinding.cpp \
-    lua/lua_RenderStateBlend.cpp \
-    lua/lua_RenderStateCullFaceSide.cpp \
-    lua/lua_RenderStateDepthFunction.cpp \
-    lua/lua_RenderStateFrontFace.cpp  \
     lua/lua_RenderStateStateBlock.cpp \
-    lua/lua_RenderStateStencilFunction.cpp \
-    lua/lua_RenderStateStencilOperation.cpp \
     lua/lua_RenderTarget.cpp \
     lua/lua_Scene.cpp \
     lua/lua_ScreenDisplayer.cpp \
+    lua/lua_Script.cpp \
     lua/lua_ScriptController.cpp \
     lua/lua_ScriptTarget.cpp \
+    lua/lua_ScriptTargetEvent.cpp \
+    lua/lua_ScriptTargetEventRegistry.cpp \
     lua/lua_Slider.cpp \
     lua/lua_SpriteBatch.cpp \
     lua/lua_Technique.cpp \
     lua/lua_Terrain.cpp \
-    lua/lua_TerrainFlags.cpp \
     lua/lua_TerrainPatch.cpp \
     lua/lua_TextBox.cpp \
-    lua/lua_TextBoxInputMode.cpp \
     lua/lua_Texture.cpp \
-    lua/lua_TextureFilter.cpp \
-    lua/lua_TextureFormat.cpp \
     lua/lua_TextureSampler.cpp \
-    lua/lua_TextureWrap.cpp \
     lua/lua_Theme.cpp \
     lua/lua_ThemeSideRegions.cpp \
     lua/lua_ThemeStyle.cpp \
     lua/lua_ThemeThemeImage.cpp \
     lua/lua_ThemeUVs.cpp \
     lua/lua_Touch.cpp \
-    lua/lua_TouchTouchEvent.cpp \
     lua/lua_Transform.cpp \
     lua/lua_TransformListener.cpp \
     lua/lua_Uniform.cpp \
@@ -282,7 +237,6 @@ LOCAL_SRC_FILES := \
     lua/lua_VertexAttributeBinding.cpp \
     lua/lua_VertexFormat.cpp \
     lua/lua_VertexFormatElement.cpp \
-    lua/lua_VertexFormatUsage.cpp \
     lua/lua_VerticalLayout.cpp
 
 LOCAL_CPPFLAGS += -std=c++11 -Wno-switch-enum -Wno-switch

samples/mesh/android/AndroidManifest.xml

@@ -11,7 +11,7 @@
     <application android:icon="@drawable/icon" android:label="@string/app_name" android:hasCode="true">
         <activity android:name="android.app.NativeActivity"
                   android:label="@string/app_name"
-                  android:configChanges="orientation|keyboardHidden"
+                  android:configChanges="orientation|keyboardHidden|screenSize"
 				  android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
 				  android:screenOrientation="landscape">
             <meta-data android:name="android.app.lib_name" android:value="sample-mesh" />

template/android/jni/template.Android.mk

@@ -70,6 +70,7 @@ LOCAL_PATH := $(VORBIS_PATH)
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libvorbis
 LOCAL_SRC_FILES := libvorbis.a
+include $(PREBUILT_STATIC_LIBRARY)
 
 # libOpenAL
 LOCAL_PATH := $(OPENAL_PATH)
@@ -85,7 +86,7 @@ include $(CLEAR_VARS)
 LOCAL_MODULE    := TEMPLATE_PROJECT
 LOCAL_SRC_FILES := ../GAMEPLAY_PATH/gameplay/src/gameplay-main-android.cpp TemplateGame.cpp
 
-LOCAL_CPPFLAGS += -std=c++11
+LOCAL_CPPFLAGS += -std=c++11 -Wno-switch-enum -Wno-switch
 LOCAL_ARM_MODE := arm
 LOCAL_LDLIBS    := -llog -landroid -lEGL -lGLESv2 -lOpenSLES
 LOCAL_CFLAGS    := -D__ANDROID__ -I"../GAMEPLAY_PATH/external-deps/lua/include" -I"../GAMEPLAY_PATH/external-deps/bullet/include" -I"../GAMEPLAY_PATH/external-deps/png/include" -I"../GAMEPLAY_PATH/external-deps/ogg/include" -I"../GAMEPLAY_PATH/external-deps/vorbis/include" -I"../GAMEPLAY_PATH/external-deps/openal/include" -I"../GAMEPLAY_PATH/gameplay/src"