From 42f8a2603eae06ca7a93a31b8fe32b97a39cd4bc Mon Sep 17 00:00:00 2001 From: Ingo Weinhold Date: Tue, 1 Nov 2005 16:24:29 +0000 Subject: [PATCH] Fixed last commit. Now we define HAIKU_TARGET_PLATFORM_* macros correctly depending on the TARGET_PLATFORM. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14617 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/BuildSetup | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index 02d0d2f5e4..cbacb00253 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -85,7 +85,6 @@ switch $(HAIKU_CPU) { } HAIKU_ARCH ?= $(HAIKU_CPU) ; HAIKU_ARCH_MACRO_DEFINE = ARCH_$(HAIKU_ARCH) ; -HAIKU_DEFINES += HAIKU_TARGET_PLATFORM_HAIKU ; HAIKU_DEFINES += $(HAIKU_ARCH_MACRO_DEFINE) ; # directories @@ -346,15 +345,6 @@ if $(HOST_PLATFORM_BEOS_COMPATIBLE) CP = copyattr --data ; } -# define macro, for identifying the platform -switch $(HOST_PLATFORM) { - case r5 : HOST_DEFINES += HAIKU_TARGET_PLATFORM_BEOS ; - case bone : HOST_DEFINES += HAIKU_TARGET_PLATFORM_BONE ; - case dano : HOST_DEFINES += HAIKU_TARGET_PLATFORM_DANO ; - case haiku : HOST_DEFINES += HAIKU_TARGET_PLATFORM_HAIKU ; - case linux : HOST_DEFINES += HAIKU_TARGET_PLATFORM_LINUX ; -} - HOST_DEFINES += $(HOST_ARCH_MACRO_DEFINE) ; HOST_DEFINES += _NO_INLINE_ASM ; @@ -516,6 +506,15 @@ if $(TARGET_PLATFORM) = haiku { TARGET_BOOT_PLATFORM = ; } +# define macro, for identifying the platform +switch $(TARGET_PLATFORM) { + case r5 : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_BEOS ; + case bone : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_BONE ; + case dano : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_DANO ; + case haiku : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_HAIKU ; + case linux : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_LINUX ; +} + #pragma mark -