i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed last commit. Now we define HAIKU_TARGET_PLATFORM_* macros correctly

Browse Source 
depending on the TARGET_PLATFORM.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14617 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2005-11-01 16:24:29 +00:00
parent 723a9e90c9
commit 42f8a2603e
1 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/jam/BuildSetup
+9 -10
View File
@@ -85,7 +85,6 @@ switch $(HAIKU_CPU) {
} }
HAIKU_ARCH ?= $(HAIKU_CPU) ; HAIKU_ARCH ?= $(HAIKU_CPU) ;
HAIKU_ARCH_MACRO_DEFINE = ARCH_$(HAIKU_ARCH) ; HAIKU_ARCH_MACRO_DEFINE = ARCH_$(HAIKU_ARCH) ;
HAIKU_DEFINES += HAIKU_TARGET_PLATFORM_HAIKU ;
HAIKU_DEFINES += $(HAIKU_ARCH_MACRO_DEFINE) ; HAIKU_DEFINES += $(HAIKU_ARCH_MACRO_DEFINE) ;
# directories # directories
@@ -346,15 +345,6 @@ if $(HOST_PLATFORM_BEOS_COMPATIBLE)
CP = copyattr --data ; 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 += $(HOST_ARCH_MACRO_DEFINE) ;
HOST_DEFINES += _NO_INLINE_ASM ; HOST_DEFINES += _NO_INLINE_ASM ;
@@ -516,6 +506,15 @@ if $(TARGET_PLATFORM) = haiku {
TARGET_BOOT_PLATFORM = ; 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 - #pragma mark -