Added x86 support for Android

gameplay/android/jni/Android.mk

@@ -1,14 +1,13 @@
-
 GAMEPLAY_PATH := $(call my-dir)/../../src
 
 # external-deps
-PNG_PATH := ../../external-deps/png/lib/android/arm
-ZLIB_PATH := ../../external-deps/zlib/lib/android/arm
-LUA_PATH := ../../external-deps/lua/lib/android/arm
-BULLET_PATH := ../../external-deps/bullet/lib/android/arm
-OGG_PATH := ../../external-deps/ogg/lib/android/arm
-VORBIS_PATH := ../../external-deps/vorbis/lib/android/arm
-OPENAL_PATH := ../../external-deps/openal/lib/android/arm
+PNG_PATH := ../../external-deps/png/lib/android/$(TARGET_ARCH_ABI)
+ZLIB_PATH := ../../external-deps/zlib/lib/android/$(TARGET_ARCH_ABI)
+LUA_PATH := ../../external-deps/lua/lib/android/$(TARGET_ARCH_ABI)
+BULLET_PATH := ../../external-deps/bullet/lib/android/$(TARGET_ARCH_ABI)
+OGG_PATH := ../../external-deps/ogg/lib/android/$(TARGET_ARCH_ABI)
+VORBIS_PATH := ../../external-deps/vorbis/lib/android/$(TARGET_ARCH_ABI)
+OPENAL_PATH := ../../external-deps/openal/lib/android/$(TARGET_ARCH_ABI)
 
 # libpng
 LOCAL_PATH := $(PNG_PATH)

gameplay/android/jni/Application.mk

@@ -2,6 +2,6 @@ NDK_TOOLCHAIN_VERSION := 4.8
 APP_CPPFLAGS += -std=c++11
 APP_STL      := gnustl_static
 APP_MODULES  := libgameplay
-APP_ABI      := armeabi-v7a
+APP_ABI      := armeabi-v7a x86
 APP_PLATFORM := android-16
 

samples/browser/CMakeLists.txt

@@ -1,3 +1,4 @@
+include(../BuildHelpers.CMakeLists.txt)
 
 include_directories( 
     ${CMAKE_SOURCE_DIR}/gameplay/src

samples/browser/android/jni/Android.mk

@@ -1,16 +1,16 @@
 SAMPLE_PATH := $(call my-dir)/../../src
 
 # external-deps
-PNG_PATH := $(call my-dir)/../../../../external-deps/png/lib/android/arm
-ZLIB_PATH := $(call my-dir)/../../../../external-deps/zlib/lib/android/arm
-LUA_PATH := $(call my-dir)/../../../../external-deps/lua/lib/android/arm
-BULLET_PATH := $(call my-dir)/../../../../external-deps/bullet/lib/android/arm
-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
+PNG_PATH := $(call my-dir)/../../../../external-deps/png/lib/android/$(TARGET_ARCH_ABI)
+ZLIB_PATH := $(call my-dir)/../../../../external-deps/zlib/lib/android/$(TARGET_ARCH_ABI)
+LUA_PATH := $(call my-dir)/../../../../external-deps/lua/lib/android/$(TARGET_ARCH_ABI)
+BULLET_PATH := $(call my-dir)/../../../../external-deps/bullet/lib/android/$(TARGET_ARCH_ABI)
+OGG_PATH := $(call my-dir)/../../../../external-deps/ogg/lib/android/$(TARGET_ARCH_ABI)
+VORBIS_PATH := $(call my-dir)/../../../../external-deps/vorbis/lib/android/$(TARGET_ARCH_ABI)
+OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/$(TARGET_ARCH_ABI)
 
 # libgameplay
-LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/libs/armeabi-v7a
+LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/libs/$(TARGET_ARCH_ABI)
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
 LOCAL_SRC_FILES := libgameplay.so

samples/browser/android/jni/Application.mk

@@ -1,5 +1,5 @@
 NDK_TOOLCHAIN_VERSION := 4.8
 APP_CPPFLAGS += -std=c++11
 APP_STL      := gnustl_static
-APP_ABI      := armeabi-v7a
+APP_ABI      := armeabi-v7a x86
 APP_PLATFORM := android-16

samples/character/android/jni/Android.mk

@@ -1,16 +1,16 @@
 SAMPLE_PATH := $(call my-dir)/../../src
 
 # external-deps
-PNG_PATH := $(call my-dir)/../../../../external-deps/png/lib/android/arm
-ZLIB_PATH := $(call my-dir)/../../../../external-deps/zlib/lib/android/arm
-LUA_PATH := $(call my-dir)/../../../../external-deps/lua/lib/android/arm
-BULLET_PATH := $(call my-dir)/../../../../external-deps/bullet/lib/android/arm
-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
+PNG_PATH := $(call my-dir)/../../../../external-deps/png/lib/android/$(TARGET_ARCH_ABI)
+ZLIB_PATH := $(call my-dir)/../../../../external-deps/zlib/lib/android/$(TARGET_ARCH_ABI)
+LUA_PATH := $(call my-dir)/../../../../external-deps/lua/lib/android/$(TARGET_ARCH_ABI)
+BULLET_PATH := $(call my-dir)/../../../../external-deps/bullet/lib/android/$(TARGET_ARCH_ABI)
+OGG_PATH := $(call my-dir)/../../../../external-deps/ogg/lib/android/$(TARGET_ARCH_ABI)
+VORBIS_PATH := $(call my-dir)/../../../../external-deps/vorbis/lib/android/$(TARGET_ARCH_ABI)
+OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/$(TARGET_ARCH_ABI)
 
 # libgameplay
-LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/libs/armeabi-v7a
+LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/libs/$(TARGET_ARCH_ABI)
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
 LOCAL_SRC_FILES := libgameplay.so

samples/character/android/jni/Application.mk

@@ -1,6 +1,6 @@
 NDK_TOOLCHAIN_VERSION := 4.8
 APP_CPPFLAGS += -std=c++11
 APP_STL      := gnustl_static
-APP_ABI      := armeabi-v7a
+APP_ABI      := armeabi-v7a x86
 APP_PLATFORM := android-16
 

samples/lua/android/jni/Android.mk

@@ -1,16 +1,16 @@
 SAMPLE_PATH := $(call my-dir)/../../src
 
 # external-deps
-PNG_PATH := $(call my-dir)/../../../../external-deps/png/lib/android/arm
-ZLIB_PATH := $(call my-dir)/../../../../external-deps/zlib/lib/android/arm
-LUA_PATH := $(call my-dir)/../../../../external-deps/lua/lib/android/arm
-BULLET_PATH := $(call my-dir)/../../../../external-deps/bullet/lib/android/arm
-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
+PNG_PATH := $(call my-dir)/../../../../external-deps/png/lib/android/$(TARGET_ARCH_ABI)
+ZLIB_PATH := $(call my-dir)/../../../../external-deps/zlib/lib/android/$(TARGET_ARCH_ABI)
+LUA_PATH := $(call my-dir)/../../../../external-deps/lua/lib/android/$(TARGET_ARCH_ABI)
+BULLET_PATH := $(call my-dir)/../../../../external-deps/bullet/lib/android/$(TARGET_ARCH_ABI)
+OGG_PATH := $(call my-dir)/../../../../external-deps/ogg/lib/android/$(TARGET_ARCH_ABI)
+VORBIS_PATH := $(call my-dir)/../../../../external-deps/vorbis/lib/android/$(TARGET_ARCH_ABI)
+OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/$(TARGET_ARCH_ABI)
 
 # libgameplay
-LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/libs/armeabi-v7a
+LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/libs/$(TARGET_ARCH_ABI)
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
 LOCAL_SRC_FILES := libgameplay.so

samples/lua/android/jni/Application.mk

@@ -1,6 +1,6 @@
 NDK_TOOLCHAIN_VERSION := 4.8
 APP_CPPFLAGS += -std=c++11
 APP_STL      := gnustl_static
-APP_ABI      := armeabi-v7a
+APP_ABI      := armeabi-v7a x86
 APP_PLATFORM := android-16
 

samples/mesh/android/jni/Android.mk

@@ -1,16 +1,16 @@
 SAMPLE_PATH := $(call my-dir)/../../src
 
 # external-deps
-PNG_PATH := $(call my-dir)/../../../../external-deps/png/lib/android/arm
-ZLIB_PATH := $(call my-dir)/../../../../external-deps/zlib/lib/android/arm
-LUA_PATH := $(call my-dir)/../../../../external-deps/lua/lib/android/arm
-BULLET_PATH := $(call my-dir)/../../../../external-deps/bullet/lib/android/arm
-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
+PNG_PATH := $(call my-dir)/../../../../external-deps/png/lib/android/$(TARGET_ARCH_ABI)
+ZLIB_PATH := $(call my-dir)/../../../../external-deps/zlib/lib/android/$(TARGET_ARCH_ABI)
+LUA_PATH := $(call my-dir)/../../../../external-deps/lua/lib/android/$(TARGET_ARCH_ABI)
+BULLET_PATH := $(call my-dir)/../../../../external-deps/bullet/lib/android/$(TARGET_ARCH_ABI)
+OGG_PATH := $(call my-dir)/../../../../external-deps/ogg/lib/android/$(TARGET_ARCH_ABI)
+VORBIS_PATH := $(call my-dir)/../../../../external-deps/vorbis/lib/android/$(TARGET_ARCH_ABI)
+OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/$(TARGET_ARCH_ABI)
 
 # libgameplay
-LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/libs/armeabi-v7a
+LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/libs/$(TARGET_ARCH_ABI)
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
 LOCAL_SRC_FILES := libgameplay.so

samples/mesh/android/jni/Application.mk

@@ -1,6 +1,6 @@
 NDK_TOOLCHAIN_VERSION := 4.8
 APP_CPPFLAGS += -std=c++11
 APP_STL      := gnustl_static
-APP_ABI      := armeabi-v7a
+APP_ABI      := armeabi-v7a x86
 APP_PLATFORM := android-16
 

samples/particles/android/jni/Android.mk

@@ -1,16 +1,16 @@
 SAMPLE_PATH := $(call my-dir)/../../src
 
 # external-deps
-PNG_PATH := $(call my-dir)/../../../../external-deps/png/lib/android/arm
-ZLIB_PATH := $(call my-dir)/../../../../external-deps/zlib/lib/android/arm
-LUA_PATH := $(call my-dir)/../../../../external-deps/lua/lib/android/arm
-BULLET_PATH := $(call my-dir)/../../../../external-deps/bullet/lib/android/arm
-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
+PNG_PATH := $(call my-dir)/../../../../external-deps/png/lib/android/$(TARGET_ARCH_ABI)
+ZLIB_PATH := $(call my-dir)/../../../../external-deps/zlib/lib/android/$(TARGET_ARCH_ABI)
+LUA_PATH := $(call my-dir)/../../../../external-deps/lua/lib/android/$(TARGET_ARCH_ABI)
+BULLET_PATH := $(call my-dir)/../../../../external-deps/bullet/lib/android/$(TARGET_ARCH_ABI)
+OGG_PATH := $(call my-dir)/../../../../external-deps/ogg/lib/android/$(TARGET_ARCH_ABI)
+VORBIS_PATH := $(call my-dir)/../../../../external-deps/vorbis/lib/android/$(TARGET_ARCH_ABI)
+OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/$(TARGET_ARCH_ABI)
 
 # libgameplay
-LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/libs/armeabi-v7a
+LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/libs/$(TARGET_ARCH_ABI)
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
 LOCAL_SRC_FILES := libgameplay.so

samples/particles/android/jni/Application.mk

@@ -1,6 +1,6 @@
 NDK_TOOLCHAIN_VERSION := 4.8
 APP_CPPFLAGS += -std=c++11
 APP_STL      := gnustl_static
-APP_ABI      := armeabi-v7a
+APP_ABI      := armeabi-v7a x86
 APP_PLATFORM := android-16
 

samples/racer/android/jni/Android.mk

@@ -1,16 +1,16 @@
 SAMPLE_PATH := $(call my-dir)/../../src
 
 # external-deps
-PNG_PATH := $(call my-dir)/../../../../external-deps/png/lib/android/arm
-ZLIB_PATH := $(call my-dir)/../../../../external-deps/zlib/lib/android/arm
-LUA_PATH := $(call my-dir)/../../../../external-deps/lua/lib/android/arm
-BULLET_PATH := $(call my-dir)/../../../../external-deps/bullet/lib/android/arm
-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
+PNG_PATH := $(call my-dir)/../../../../external-deps/png/lib/android/$(TARGET_ARCH_ABI)
+ZLIB_PATH := $(call my-dir)/../../../../external-deps/zlib/lib/android/$(TARGET_ARCH_ABI)
+LUA_PATH := $(call my-dir)/../../../../external-deps/lua/lib/android/$(TARGET_ARCH_ABI)
+BULLET_PATH := $(call my-dir)/../../../../external-deps/bullet/lib/android/$(TARGET_ARCH_ABI)
+OGG_PATH := $(call my-dir)/../../../../external-deps/ogg/lib/android/$(TARGET_ARCH_ABI)
+VORBIS_PATH := $(call my-dir)/../../../../external-deps/vorbis/lib/android/$(TARGET_ARCH_ABI)
+OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/$(TARGET_ARCH_ABI)
 
 # libgameplay
-LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/libs/armeabi-v7a
+LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/libs/$(TARGET_ARCH_ABI)
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
 LOCAL_SRC_FILES := libgameplay.so

samples/racer/android/jni/Application.mk

@@ -1,6 +1,6 @@
 NDK_TOOLCHAIN_VERSION := 4.8
 APP_CPPFLAGS += -std=c++11
 APP_STL      := gnustl_static
-APP_ABI      := armeabi-v7a
+APP_ABI      := armeabi-v7a x86
 APP_PLATFORM := android-16
 

samples/spaceship/android/jni/Android.mk

@@ -1,13 +1,13 @@
 SAMPLE_PATH := $(call my-dir)/../../src
 
 # external-deps
-PNG_PATH := $(call my-dir)/../../../../external-deps/png/lib/android/arm
-ZLIB_PATH := $(call my-dir)/../../../../external-deps/zlib/lib/android/arm
-LUA_PATH := $(call my-dir)/../../../../external-deps/lua/lib/android/arm
-BULLET_PATH := $(call my-dir)/../../../../external-deps/bullet/lib/android/arm
-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
+PNG_PATH := $(call my-dir)/../../../../external-deps/png/lib/android/$(TARGET_ARCH_ABI)
+ZLIB_PATH := $(call my-dir)/../../../../external-deps/zlib/lib/android/$(TARGET_ARCH_ABI)
+LUA_PATH := $(call my-dir)/../../../../external-deps/lua/lib/android/$(TARGET_ARCH_ABI)
+BULLET_PATH := $(call my-dir)/../../../../external-deps/bullet/lib/android/$(TARGET_ARCH_ABI)
+OGG_PATH := $(call my-dir)/../../../../external-deps/ogg/lib/android/$(TARGET_ARCH_ABI)
+VORBIS_PATH := $(call my-dir)/../../../../external-deps/vorbis/lib/android/$(TARGET_ARCH_ABI)
+OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/$(TARGET_ARCH_ABI)
 
 # libgameplay
 LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/libs/armeabi-v7a

samples/spaceship/android/jni/Application.mk

@@ -1,6 +1,6 @@
 NDK_TOOLCHAIN_VERSION := 4.8
 APP_CPPFLAGS += -std=c++11
 APP_STL      := gnustl_static
-APP_ABI      := armeabi-v7a
+APP_ABI      := armeabi-v7a x86
 APP_PLATFORM := android-16
 

template/android/jni/Android.mk

@@ -1,16 +1,16 @@
 SAMPLE_PATH := $(call my-dir)/../../src
 
 # external-deps
-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
+PNG_PATH := $(call my-dir)/../../GAMEPLAY_PATH/external-deps/png/lib/android/$(TARGET_ARCH_ABI)
+ZLIB_PATH := $(call my-dir)/../../GAMEPLAY_PATH/external-deps/zlib/lib/android/$(TARGET_ARCH_ABI)
+LUA_PATH := $(call my-dir)/../../GAMEPLAY_PATH/external-deps/lua/lib/android/$(TARGET_ARCH_ABI)
+BULLET_PATH := $(call my-dir)/../../GAMEPLAY_PATH/external-deps/bullet/lib/android/$(TARGET_ARCH_ABI)
+OGG_PATH := $(call my-dir)/../../GAMEPLAY_PATH/external-deps/ogg/lib/android/$(TARGET_ARCH_ABI)
+VORBIS_PATH := $(call my-dir)/../../GAMEPLAY_PATH/external-deps/vorbis/lib/android/$(TARGET_ARCH_ABI)
+OPENAL_PATH := $(call my-dir)/../../GAMEPLAY_PATH/external-deps/openal/lib/android/$(TARGET_ARCH_ABI)
 
 # libgameplay
-LOCAL_PATH := $(call my-dir)/../../GAMEPLAY_PATH/gameplay/android/libs/armeabi-v7a
+LOCAL_PATH := $(call my-dir)/../../GAMEPLAY_PATH/gameplay/android/libs/$(TARGET_ARCH_ABI)
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
 LOCAL_SRC_FILES := libgameplay.so

template/android/jni/Application.mk

@@ -1,5 +1,5 @@
 NDK_TOOLCHAIN_VERSION := 4.8
 APP_CPPFLAGS += -std=c++11
 APP_STL      := gnustl_static
-APP_ABI      := armeabi-v7a
+APP_ABI      := armeabi-v7a x86
 APP_PLATFORM := android-16