From 2500f308a955e77b16f46026423bd8af60abefc9 Mon Sep 17 00:00:00 2001 From: Marcelo Fernandez Date: Wed, 28 Nov 2018 14:19:50 -0300 Subject: [PATCH] Improvements on SConstruct arch detection --- SConstruct | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/SConstruct b/SConstruct index db9dbc9..3dd7239 100644 --- a/SConstruct +++ b/SConstruct @@ -38,7 +38,7 @@ opts.Add(BoolVariable('generate_bindings', 'Generate GDNative API bindings', Fal unknown = opts.UnknownVariables() if unknown: - print "Unknown variables:", unknown.keys() + print("Unknown variables:" + unknown.keys()) Exit(1) env = Environment() @@ -52,9 +52,13 @@ if env['platform'] == 'windows': env = Environment(TARGET_ARCH='amd64') elif env['bits'] == '32': env = Environment(TARGET_ARCH='x86') + else: + print("Warning: bits argument not specified, target arch is=" + env['TARGET_ARCH']) opts.Update(env) -is64 = sys.maxsize > 2**32 +is64 = False +if (env['TARGET_ARCH'] == 'amd64' or env['TARGET_ARCH'] == 'emt64' or env['TARGET_ARCH'] == 'x86_64'): + is64 = True if env['bits'] == 'default': env['bits'] = '64' if is64 else '32'