Merge pull request #6978 from webgeek1234/android_url

Fix android armeabi and x86_64 core updater urls
This commit is contained in:
Twinaphex 2018-07-13 04:22:12 +02:00 committed by GitHub
commit 42c4e8c687
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 1 deletions

View File

@ -701,12 +701,16 @@ static const unsigned midi_volume = 100;
static const bool sustained_performance_mode = false;
#if defined(ANDROID)
#if defined(ANDROID_ARM)
#if defined(ANDROID_ARM_V7)
static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/armeabi-v7a/";
#elif defined(ANDROID_ARM)
static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/armeabi/";
#elif defined(ANDROID_AARCH64)
static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/arm64-v8a/";
#elif defined(ANDROID_X86)
static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/x86/";
#elif defined(ANDROID_X64)
static char buildbot_server_url[] = "http://buildbot.libretro.com/nightly/android/latest/x86_64/";
#else
static char buildbot_server_url[] = "";
#endif

View File

@ -29,6 +29,10 @@ ifeq ($(TARGET_ARCH),x86)
DEFINES += -DANDROID_X86 -DHAVE_SSSE3
endif
ifeq ($(TARGET_ARCH),x86_64)
DEFINES += -DANDROID_X64
endif
ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
ifeq ($(HAVE_NEON),1)