From b601a549d07c71f3980397baadee322c7c269aed Mon Sep 17 00:00:00 2001 From: Rolzad73 Date: Thu, 4 Aug 2016 11:26:41 -0400 Subject: [PATCH] - added option for Android x86 build types --- JGE/Dependencies/SDL/src/atomic/SDL_spinlock.c | 7 +++++++ projects/mtg/Android/jni/Application.mk | 1 + 2 files changed, 8 insertions(+) diff --git a/JGE/Dependencies/SDL/src/atomic/SDL_spinlock.c b/JGE/Dependencies/SDL/src/atomic/SDL_spinlock.c index f74de81c7..07c26308a 100644 --- a/JGE/Dependencies/SDL/src/atomic/SDL_spinlock.c +++ b/JGE/Dependencies/SDL/src/atomic/SDL_spinlock.c @@ -77,6 +77,13 @@ SDL_AtomicTryLock(SDL_SpinLock *lock) : "=&r" (result) : "r" (1), "r" (lock) : "cc", "memory"); return (result == 0); +#elif defined(__GNUC__) && (defined(__i386__) || defined(__x86_64__)) + int result; + __asm__ __volatile__( + "lock ; xchgl %0, (%1)\n" + : "=r" (result) : "r" (lock), "0" (1) : "cc", "memory"); + return (result == 0); + #else /* Need CPU instructions for spinlock here! */ __need_spinlock_implementation__ diff --git a/projects/mtg/Android/jni/Application.mk b/projects/mtg/Android/jni/Application.mk index 01804bb30..53a2e0f9d 100644 --- a/projects/mtg/Android/jni/Application.mk +++ b/projects/mtg/Android/jni/Application.mk @@ -1,6 +1,7 @@ APP_PROJECT_PATH := $(call my-dir)/.. APP_CPPFLAGS += -frtti -fexceptions APP_ABI := armeabi armeabi-v7a +#APP_ABI := x86 # mainly for emulators APP_STL := gnustl_static APP_MODULES := libpng libjpeg main SDL