From a17b9c0c086ce9bb118ba3146e53c37d98551ae0 Mon Sep 17 00:00:00 2001 From: shatty Date: Mon, 25 Oct 2004 08:44:06 +0000 Subject: [PATCH] improved platform targeting git-svn-id: file:///srv/svn/repos/haiku/trunk/current@9497 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- Jamrules | 23 +++++++++++++++++++++-- configure | 13 ++++++++----- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/Jamrules b/Jamrules index 4cd9ac1874..8dcdd88a21 100644 --- a/Jamrules +++ b/Jamrules @@ -81,8 +81,27 @@ C++FLAGS += -nostdinc ; # issues, they deprecated that nice function. This will enable it again: C++FLAGS += -D_ZETA_USING_DEPRECATED_API_=1 ; -if $(TARGET_PLATFORM) = r5 { - C++FLAGS += -DCOMPILE_FOR_R5 ; +switch $(TARGET_PLATFORM) +{ + case r5 : + { + C++FLAGS += -DCOMPILE_FOR_R5 ; + } + case bone : + { + BONE_COMPATIBLE = true ; + } + case dano : + { + BONE_COMPATIBLE = true ; + DANO_COMPATIBLE = true ; + } + case haiku : + { + BONE_COMPATIBLE = true ; + DANO_COMPATIBLE = true ; + HAIKU_COMPATIBLE = true ; + } } # Determine if we're building on PPC or x86 diff --git a/configure b/configure index 54d511fe68..cd404ba9f9 100755 --- a/configure +++ b/configure @@ -18,6 +18,7 @@ options: (device or image). --bochs-debug Activates bochs serial debug emulation. --target=TARGET Select build target platform. [default=${target}] + valid targets=r5,bone,dano,haiku --include-gpl-addons Include GPL licensed add-ons. --help Prints out this help. EOF @@ -66,11 +67,13 @@ gcc_version= floppy= bochs_debug=0 include_gpl_addons=0 -if (echo $BEINCLUDES | grep 'headers/be/bone' > /dev/null); then - target=bone -else - target=r5 -fi +revision=`uname -r` +case "$revision" in + 5.1) target=dano ;; + 5.0.4) target=bone ;; + 5.0*) target=r5 ;; + *) target="$platform" ;; +esac # parse parameters #