Merge pull request #1568 from seanpaultaylor/next

Fixes for Android Eclipse template files

gameplay/android/.project

@@ -9,6 +9,54 @@
 			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
 			<triggers>clean,full,incremental,</triggers>
 			<arguments>
+				<dictionary>
+					<key>?children?</key>
+					<value>?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||</value>
+				</dictionary>
+				<dictionary>
+					<key>?name?</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.append_environment</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildArguments</key>
+					<value>NDK_DEBUG=1 -j4</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildCommand</key>
+					<value>ndk-build</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
+					<value>clean</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.contents</key>
+					<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+					<value>false</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.stopOnError</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+					<value>false</value>
+				</dictionary>
 			</arguments>
 		</buildCommand>
 		<buildCommand>

samples/browser/android/jni/Android.mk

@@ -9,7 +9,7 @@ OGG_PATH := $(call my-dir)/../../../../external-deps/ogg/lib/android/arm
 VORBIS_PATH := $(call my-dir)/../../../../external-deps/vorbis/lib/android/arm
 OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/arm
 
-# gameplay
+# libgameplay
 LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/libs/armeabi-v7a
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay

samples/character/android/jni/Android.mk

@@ -9,7 +9,7 @@ OGG_PATH := $(call my-dir)/../../../../external-deps/ogg/lib/android/arm
 VORBIS_PATH := $(call my-dir)/../../../../external-deps/vorbis/lib/android/arm
 OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/arm
 
-# gameplay
+# libgameplay
 LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/libs/armeabi-v7a
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
@@ -82,7 +82,6 @@ include $(PREBUILT_STATIC_LIBRARY)
 # sample-character
 LOCAL_PATH := $(SAMPLE_PATH)
 include $(CLEAR_VARS)
-
 LOCAL_MODULE    := sample-character
 LOCAL_SRC_FILES := ../../../gameplay/src/gameplay-main-android.cpp CharacterGame.cpp
 LOCAL_CPPFLAGS += -std=c++11 -Wno-switch-enum -Wno-switch

samples/lua/android/jni/Android.mk

@@ -9,7 +9,7 @@ OGG_PATH := $(call my-dir)/../../../../external-deps/ogg/lib/android/arm
 VORBIS_PATH := $(call my-dir)/../../../../external-deps/vorbis/lib/android/arm
 OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/arm
 
-# gameplay
+# libgameplay
 LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/libs/armeabi-v7a
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
@@ -82,10 +82,8 @@ include $(PREBUILT_STATIC_LIBRARY)
 # sample-lua
 LOCAL_PATH := $(SAMPLE_PATH)
 include $(CLEAR_VARS)
-
 LOCAL_MODULE    := sample-lua
 LOCAL_SRC_FILES := ../../../gameplay/src/gameplay-main-android.cpp LuaGame.cpp
-
 LOCAL_CPPFLAGS += -std=c++11 -Wno-switch-enum -Wno-switch
 LOCAL_ARM_MODE := arm
 LOCAL_LDLIBS    := -llog -landroid -lEGL -lGLESv2 -lOpenSLES
@@ -93,4 +91,5 @@ LOCAL_CFLAGS    := -D__ANDROID__ -I"../../../external-deps/lua/include" -I"../..
 LOCAL_STATIC_LIBRARIES := android_native_app_glue libpng libz liblua libBulletDynamics libBulletCollision libLinearMath libvorbis libogg libOpenAL
 LOCAL_SHARED_LIBRARIES := gameplay
 include $(BUILD_SHARED_LIBRARY)
+
 $(call import-module,android/native_app_glue)

samples/mesh/android/.project

@@ -10,6 +10,54 @@
 			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
 			<triggers>clean,full,incremental,</triggers>
 			<arguments>
+				<dictionary>
+					<key>?children?</key>
+					<value>?name?=outputEntries\|?children?=?name?=entry\\\\\\\|\\\|?name?=entry\\\\\\\|\\\|\||</value>
+				</dictionary>
+				<dictionary>
+					<key>?name?</key>
+					<value></value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.append_environment</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildArguments</key>
+					<value>NDK_DEBUG=1 -j4</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.buildCommand</key>
+					<value>ndk-build</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.cleanBuildTarget</key>
+					<value>clean</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.contents</key>
+					<value>org.eclipse.cdt.make.core.activeConfigSettings</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
+					<value>false</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.enableFullBuild</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.stopOnError</key>
+					<value>true</value>
+				</dictionary>
+				<dictionary>
+					<key>org.eclipse.cdt.make.core.useDefaultBuildCmd</key>
+					<value>false</value>
+				</dictionary>
 			</arguments>
 		</buildCommand>
 		<buildCommand>

samples/mesh/android/jni/Android.mk

@@ -9,7 +9,7 @@ OGG_PATH := $(call my-dir)/../../../../external-deps/ogg/lib/android/arm
 VORBIS_PATH := $(call my-dir)/../../../../external-deps/vorbis/lib/android/arm
 OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/arm
 
-# gameplay
+# libgameplay
 LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/libs/armeabi-v7a
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
@@ -82,10 +82,8 @@ include $(PREBUILT_STATIC_LIBRARY)
 # sample-mesh
 LOCAL_PATH := $(SAMPLE_PATH)
 include $(CLEAR_VARS)
-
 LOCAL_MODULE    := sample-mesh
 LOCAL_SRC_FILES := ../../../gameplay/src/gameplay-main-android.cpp MeshGame.cpp
-
 LOCAL_CPPFLAGS += -std=c++11 -Wno-switch-enum -Wno-switch
 LOCAL_ARM_MODE := arm
 LOCAL_LDLIBS    := -llog -landroid -lEGL -lGLESv2 -lOpenSLES
@@ -93,4 +91,5 @@ LOCAL_CFLAGS    := -D__ANDROID__ -I"../../../external-deps/lua/include" -I"../..
 LOCAL_STATIC_LIBRARIES := android_native_app_glue libpng libz liblua libBulletDynamics libBulletCollision libLinearMath libvorbis libogg libOpenAL
 LOCAL_SHARED_LIBRARIES := gameplay
 include $(BUILD_SHARED_LIBRARY)
+
 $(call import-module,android/native_app_glue)

samples/particles/android/jni/Android.mk

@@ -9,7 +9,7 @@ OGG_PATH := $(call my-dir)/../../../../external-deps/ogg/lib/android/arm
 VORBIS_PATH := $(call my-dir)/../../../../external-deps/vorbis/lib/android/arm
 OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/arm
 
-# gameplay
+# libgameplay
 LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/libs/armeabi-v7a
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
@@ -82,10 +82,8 @@ include $(PREBUILT_STATIC_LIBRARY)
 # sample-particles
 LOCAL_PATH := $(SAMPLE_PATH)
 include $(CLEAR_VARS)
-
 LOCAL_MODULE    := sample-particles
 LOCAL_SRC_FILES := ../../../gameplay/src/gameplay-main-android.cpp ParticlesGame.cpp
-
 LOCAL_CPPFLAGS += -std=c++11 -Wno-switch-enum -Wno-switch
 LOCAL_ARM_MODE := arm
 LOCAL_LDLIBS    := -llog -landroid -lEGL -lGLESv2 -lOpenSLES
@@ -93,4 +91,5 @@ LOCAL_CFLAGS    := -D__ANDROID__ -I"../../../external-deps/lua/include" -I"../..
 LOCAL_STATIC_LIBRARIES := android_native_app_glue libpng libz liblua libBulletDynamics libBulletCollision libLinearMath libvorbis libogg libOpenAL
 LOCAL_SHARED_LIBRARIES := gameplay
 include $(BUILD_SHARED_LIBRARY)
+
 $(call import-module,android/native_app_glue)

samples/racer/android/jni/Android.mk

@@ -9,7 +9,7 @@ OGG_PATH := $(call my-dir)/../../../../external-deps/ogg/lib/android/arm
 VORBIS_PATH := $(call my-dir)/../../../../external-deps/vorbis/lib/android/arm
 OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/arm
 
-# gameplay
+# libgameplay
 LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/libs/armeabi-v7a
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
@@ -82,10 +82,8 @@ include $(PREBUILT_STATIC_LIBRARY)
 # sample-racer
 LOCAL_PATH := $(SAMPLE_PATH)
 include $(CLEAR_VARS)
-
 LOCAL_MODULE    := sample-racer
 LOCAL_SRC_FILES := ../../../gameplay/src/gameplay-main-android.cpp RacerGame.cpp
-
 LOCAL_CPPFLAGS += -std=c++11 -Wno-switch-enum -Wno-switch
 LOCAL_ARM_MODE := arm
 LOCAL_LDLIBS    := -llog -landroid -lEGL -lGLESv2 -lOpenSLES
@@ -93,4 +91,5 @@ LOCAL_CFLAGS    := -D__ANDROID__ -I"../../../external-deps/lua/include" -I"../..
 LOCAL_STATIC_LIBRARIES := android_native_app_glue libpng libz liblua libBulletDynamics libBulletCollision libLinearMath libvorbis libogg libOpenAL
 LOCAL_SHARED_LIBRARIES := gameplay
 include $(BUILD_SHARED_LIBRARY)
+
 $(call import-module,android/native_app_glue)

samples/spaceship/android/jni/Android.mk

@@ -9,7 +9,7 @@ OGG_PATH := $(call my-dir)/../../../../external-deps/ogg/lib/android/arm
 VORBIS_PATH := $(call my-dir)/../../../../external-deps/vorbis/lib/android/arm
 OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/arm
 
-# gameplay
+# libgameplay
 LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/libs/armeabi-v7a
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
@@ -82,10 +82,8 @@ include $(PREBUILT_STATIC_LIBRARY)
 # sample-spaceship
 LOCAL_PATH := $(SAMPLE_PATH)
 include $(CLEAR_VARS)
-
 LOCAL_MODULE    := sample-spaceship
 LOCAL_SRC_FILES := ../../../gameplay/src/gameplay-main-android.cpp SpaceshipGame.cpp
-
 LOCAL_CPPFLAGS += -std=c++11 -Wno-switch-enum -Wno-switch
 LOCAL_ARM_MODE := arm
 LOCAL_LDLIBS    := -llog -landroid -lEGL -lGLESv2 -lOpenSLES
@@ -93,4 +91,5 @@ LOCAL_CFLAGS    := -D__ANDROID__ -I"../../../external-deps/lua/include" -I"../..
 LOCAL_STATIC_LIBRARIES := android_native_app_glue libpng libz liblua libBulletDynamics libBulletCollision libLinearMath libvorbis libogg libOpenAL
 LOCAL_SHARED_LIBRARIES := gameplay
 include $(BUILD_SHARED_LIBRARY)
+
 $(call import-module,android/native_app_glue)

template/android/jni/Android.mk

@@ -1,16 +1,16 @@
 SAMPLE_PATH := $(call my-dir)/../../src
 
 # external-deps
-PNG_PATH := ../GAMEPLAY_PATH/external-deps/png/lib/android/arm
-ZLIB_PATH := ../GAMEPLAY_PATH/external-deps/zlib/lib/android/arm
-LUA_PATH := ../GAMEPLAY_PATH/external-deps/lua/lib/android/arm
-BULLET_PATH := ../GAMEPLAY_PATH/external-deps/bullet/lib/android/arm
-OGG_PATH := ../GAMEPLAY_PATH/external-deps/ogg/lib/android/arm
-VORBIS_PATH := ../GAMEPLAY_PATH/external-deps/vorbis/lib/android/arm
-OPENAL_PATH := ../GAMEPLAY_PATH/external-deps/openal/lib/android/arm
-
-# gameplay
-LOCAL_PATH := ../GAMEPLAY_PATH/gameplay/android/obj/local/armeabi-v7a
+PNG_PATH := $(call my-dir)/../../GAMEPLAY_PATH/external-deps/png/lib/android/arm
+ZLIB_PATH := $(call my-dir)/../../GAMEPLAY_PATH/external-deps/zlib/lib/android/arm
+LUA_PATH := $(call my-dir)/../../GAMEPLAY_PATH/external-deps/lua/lib/android/arm
+BULLET_PATH := $(call my-dir)/../../GAMEPLAY_PATH/external-deps/bullet/lib/android/arm
+OGG_PATH := $(call my-dir)/../../GAMEPLAY_PATH/external-deps/ogg/lib/android/arm
+VORBIS_PATH := $(call my-dir)/../../GAMEPLAY_PATH/external-deps/vorbis/lib/android/arm
+OPENAL_PATH := $(call my-dir)/../../GAMEPLAY_PATH/external-deps/openal/lib/android/arm
+
+# libgameplay
+LOCAL_PATH := $(call my-dir)/../../GAMEPLAY_PATH/gameplay/android/libs/armeabi-v7a
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
 LOCAL_SRC_FILES := libgameplay.so
@@ -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)
@@ -81,17 +82,14 @@ include $(PREBUILT_STATIC_LIBRARY)
 # TEMPLATE_PROJECT
 LOCAL_PATH := $(SAMPLE_PATH)
 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"
-
 LOCAL_STATIC_LIBRARIES := android_native_app_glue libpng libz liblua libBulletDynamics libBulletCollision libLinearMath libvorbis libogg libOpenAL
-LOCAL_STATIC_LIBRARIES := gameplay
+LOCAL_SHARED_LIBRARIES := gameplay
 include $(BUILD_SHARED_LIBRARY)
 
 $(call import-module,android/native_app_glue)

template/android/jni/template.Android.mk

@@ -1,96 +0,0 @@
-SAMPLE_PATH := $(call my-dir)/../../src
-
-# external-deps
-PNG_PATH := ../GAMEPLAY_PATH/external-deps/png/lib/android/arm
-ZLIB_PATH := ../GAMEPLAY_PATH/external-deps/zlib/lib/android/arm
-LUA_PATH := ../GAMEPLAY_PATH/external-deps/lua/lib/android/arm
-BULLET_PATH := ../GAMEPLAY_PATH/external-deps/bullet/lib/android/arm
-OGG_PATH := ../GAMEPLAY_PATH/external-deps/ogg/lib/android/arm
-VORBIS_PATH := ../GAMEPLAY_PATH/external-deps/vorbis/lib/android/arm
-OPENAL_PATH := ../GAMEPLAY_PATH/external-deps/openal/lib/android/arm
-
-# gameplay
-LOCAL_PATH := ../GAMEPLAY_PATH/gameplay/android/obj/local/armeabi-v7a
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libgameplay
-LOCAL_SRC_FILES := libgameplay.so
-include $(PREBUILT_SHARED_LIBRARY)
-
-# libpng
-LOCAL_PATH := $(PNG_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libpng 
-LOCAL_SRC_FILES := libpng.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# libz
-LOCAL_PATH := $(ZLIB_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libz
-LOCAL_SRC_FILES := libz.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# liblua
-LOCAL_PATH := $(LUA_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := liblua
-LOCAL_SRC_FILES := liblua.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# libLinearMath
-LOCAL_PATH := $(BULLET_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libLinearMath
-LOCAL_SRC_FILES := libLinearMath.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# libBulletCollision
-LOCAL_PATH := $(BULLET_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libBulletCollision
-LOCAL_SRC_FILES := libBulletCollision.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# libBulletDynamics
-LOCAL_PATH := $(BULLET_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libBulletDynamics
-LOCAL_SRC_FILES := libBulletDynamics.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# libogg
-LOCAL_PATH := $(OGG_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libogg
-LOCAL_SRC_FILES := libogg.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# libvorbis
-LOCAL_PATH := $(VORBIS_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libvorbis
-LOCAL_SRC_FILES := libvorbis.a
-
-# libOpenAL
-LOCAL_PATH := $(OPENAL_PATH)
-include $(CLEAR_VARS)
-LOCAL_MODULE    := libOpenAL
-LOCAL_SRC_FILES := libOpenAL.a
-include $(PREBUILT_STATIC_LIBRARY)
-
-# TEMPLATE_PROJECT
-LOCAL_PATH := $(SAMPLE_PATH)
-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_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"
-
-LOCAL_STATIC_LIBRARIES := android_native_app_glue libgameplay libpng libz liblua libBulletDynamics libBulletCollision libLinearMath libvorbis libogg libOpenAL
-
-include $(BUILD_SHARED_LIBRARY)
-$(call import-module,android/native_app_glue)

template/src/TemplateGame.h

@@ -1,5 +1,5 @@
-#ifndef TEMPLATEGAME_H_
-#define TEMPLATEGAME_H_
+#ifndef TemplateGame_H_
+#define TemplateGame_H_
 
 #include "gameplay.h"