Просмотр исходного кода

Fixed sample builds for Android

Default target for Android builds is armeabi-v7a for a while, updated
the samples to build with that.
Üstün Ergenoglu 12 лет назад
Родитель
Сommit
cbd2fc6441

+ 1 - 1
samples/browser/android/jni/Android.mk

@@ -9,7 +9,7 @@ VORBIS_PATH := $(call my-dir)/../../../../external-deps/oggvorbis/lib/android/ar
 OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/arm
 
 # gameplay
-LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/obj/local/armeabi
+LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/obj/local/armeabi-v7a
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
 LOCAL_SRC_FILES := libgameplay.a

+ 2 - 1
samples/browser/android/jni/Application.mk

@@ -1 +1,2 @@
-APP_STL     := stlport_static
+APP_STL     := stlport_static
+APP_ABI     := armeabi-v7a

+ 1 - 1
samples/character/android/jni/Android.mk

@@ -9,7 +9,7 @@ VORBIS_PATH := $(call my-dir)/../../../../external-deps/oggvorbis/lib/android/ar
 OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/arm
 
 # gameplay
-LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/obj/local/armeabi
+LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/obj/local/armeabi-v7a
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
 LOCAL_SRC_FILES := libgameplay.a

+ 3 - 1
samples/character/android/jni/Application.mk

@@ -1 +1,3 @@
-APP_STL     := stlport_static
+APP_STL     := stlport_static
+APP_ABI     := armeabi-v7a
+

+ 1 - 1
samples/longboard/android/jni/Android.mk

@@ -9,7 +9,7 @@ VORBIS_PATH := $(call my-dir)/../../../../external-deps/oggvorbis/lib/android/ar
 OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/arm
 
 # gameplay
-LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/obj/local/armeabi
+LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/obj/local/armeabi-v7a
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
 LOCAL_SRC_FILES := libgameplay.a

+ 3 - 1
samples/longboard/android/jni/Application.mk

@@ -1 +1,3 @@
-APP_STL     := stlport_static
+APP_STL     := stlport_static
+APP_ABI     := armeabi-v7a
+

+ 1 - 1
samples/lua/android/jni/Android.mk

@@ -9,7 +9,7 @@ VORBIS_PATH := $(call my-dir)/../../../../external-deps/oggvorbis/lib/android/ar
 OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/arm
 
 # gameplay
-LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/obj/local/armeabi
+LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/obj/local/armeabi-v7a
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
 LOCAL_SRC_FILES := libgameplay.a

+ 3 - 1
samples/lua/android/jni/Application.mk

@@ -1 +1,3 @@
-APP_STL     := stlport_static
+APP_STL     := stlport_static
+APP_ABI     := armeabi-v7a
+

+ 1 - 1
samples/mesh/android/jni/Android.mk

@@ -9,7 +9,7 @@ VORBIS_PATH := $(call my-dir)/../../../../external-deps/oggvorbis/lib/android/ar
 OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/arm
 
 # gameplay
-LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/obj/local/armeabi
+LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/obj/local/armeabi-v7a
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
 LOCAL_SRC_FILES := libgameplay.a

+ 3 - 1
samples/mesh/android/jni/Application.mk

@@ -1 +1,3 @@
-APP_STL     := stlport_static
+APP_STL     := stlport_static
+APP_ABI     := armeabi-v7a
+

+ 1 - 1
samples/particles/android/jni/Android.mk

@@ -9,7 +9,7 @@ VORBIS_PATH := $(call my-dir)/../../../../external-deps/oggvorbis/lib/android/ar
 OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/arm
 
 # gameplay
-LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/obj/local/armeabi
+LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/obj/local/armeabi-v7a
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
 LOCAL_SRC_FILES := libgameplay.a

+ 3 - 1
samples/particles/android/jni/Application.mk

@@ -1 +1,3 @@
-APP_STL     := stlport_static
+APP_STL     := stlport_static
+APP_ABI     := armeabi-v7a
+

+ 1 - 1
samples/racer/android/jni/Android.mk

@@ -9,7 +9,7 @@ VORBIS_PATH := $(call my-dir)/../../../../external-deps/oggvorbis/lib/android/ar
 OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/arm
 
 # gameplay
-LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/obj/local/armeabi
+LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/obj/local/armeabi-v7a
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
 LOCAL_SRC_FILES := libgameplay.a

+ 3 - 1
samples/racer/android/jni/Application.mk

@@ -1 +1,3 @@
-APP_STL     := stlport_static
+APP_STL     := stlport_static
+APP_ABI     := armeabi-v7a
+

+ 1 - 1
samples/spaceship/android/jni/Android.mk

@@ -9,7 +9,7 @@ VORBIS_PATH := $(call my-dir)/../../../../external-deps/oggvorbis/lib/android/ar
 OPENAL_PATH := $(call my-dir)/../../../../external-deps/openal/lib/android/arm
 
 # gameplay
-LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/obj/local/armeabi
+LOCAL_PATH := $(call my-dir)/../../../../gameplay/android/obj/local/armeabi-v7a
 include $(CLEAR_VARS)
 LOCAL_MODULE    := libgameplay
 LOCAL_SRC_FILES := libgameplay.a

+ 3 - 1
samples/spaceship/android/jni/Application.mk

@@ -1 +1,3 @@
-APP_STL     := stlport_static
+APP_STL     := stlport_static
+APP_ABI     := armeabi-v7a
+