From 66c740b40577c8190c93d3993955d5bd74ce6509 Mon Sep 17 00:00:00 2001 From: dhewg Date: Thu, 1 Dec 2011 10:36:59 +0100 Subject: [PATCH] Basic infrastructure for native x86_64 builds Let scons link directly in the build folder. Multiple archs can coexist next to each other. New scons variable "X86" to cross compile x86 binaries on x86_64. --- idlib/precompiled.h | 1 + sys/sys_public.h | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/idlib/precompiled.h b/idlib/precompiled.h index dca42d7..136f301 100644 --- a/idlib/precompiled.h +++ b/idlib/precompiled.h @@ -93,6 +93,7 @@ If you have questions concerning this license or the applicable additional terms #define NDEBUG #endif +#include #include #include #include diff --git a/sys/sys_public.h b/sys/sys_public.h index c76bc38..f31226a 100644 --- a/sys/sys_public.h +++ b/sys/sys_public.h @@ -103,11 +103,16 @@ If you have questions concerning this license or the applicable additional terms // Linux #ifdef __linux__ +#define BUILD_OS_ID 2 + #ifdef __i386__ #define BUILD_STRING "linux-x86" - #define BUILD_OS_ID 2 #define CPUSTRING "x86" #define CPU_EASYARGS 1 +#elif defined(__x86_64__) + #define BUILD_STRING "linux-x86_64" + #define CPUSTRING "x86_64" + #define CPU_EASYARGS 0 #elif defined(__ppc__) #define BUILD_STRING "linux-ppc" #define CPUSTRING "ppc"