From 730279531a8fa77ba46d19e814a4419053371316 Mon Sep 17 00:00:00 2001 From: rdb Date: Sat, 10 Feb 2018 12:13:05 +0100 Subject: [PATCH] makepanda: build on Intel Android machines --- dtool/src/dtoolbase/dtool_platform.h | 2 ++ makepanda/makepanda.py | 2 ++ 2 files changed, 4 insertions(+) diff --git a/dtool/src/dtoolbase/dtool_platform.h b/dtool/src/dtoolbase/dtool_platform.h index 9037632738..2a6ed12a9b 100644 --- a/dtool/src/dtoolbase/dtool_platform.h +++ b/dtool/src/dtoolbase/dtool_platform.h @@ -57,6 +57,8 @@ #define DTOOL_PLATFORM "android_arm" #elif defined(__mips__) #define DTOOL_PLATFORM "android_mips" +#elif defined(__x86_64) +#define DTOOL_PLATFORM "android_amd64" #elif defined(__i386__) #define DTOOL_PLATFORM "android_i386" #endif diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index b8aa622429..9b653bfc1c 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -1291,9 +1291,11 @@ def CompileCxx(obj,src,opts): cmd += ' -fintegrated-as' elif arch == 'x86': cmd += ' -target i686-none-linux-android' + cmd += ' -march=i686 -mtune=intel -mssse3 -mfpmath=sse -m32' cmd += ' -mstackrealign' elif arch == 'x86_64': cmd += ' -target x86_64-none-linux-android' + cmd += ' -march=x86-64 -msse4.2 -mpopcnt -m64 -mtune=intel' cmd += " -Wa,--noexecstack"