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

This should fix the build under Dano/Zeta again, at least it works here:

Browse Source 
* added HaikuBuildCompatibility.h to the src/build/* files that are built as
  part of the tools we need to build Haiku.
* Changed HaikuBuildCompatibility.h so that it does not define the things
  that are already in the build headers.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24147 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2008-02-27 09:03:46 +00:00
parent 6dffd08db7
commit 9c800a96c0
3 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/build/HaikuBuildCompatibility.h
+17 -11
View File
@@ -9,15 +9,19 @@
kludges in our source files at a minimum. kludges in our source files at a minimum.
*/ */
#include <sys/types.h> #ifdef HAIKU_HOST_PLATFORM_DANO
#include <SupportDefs.h> # include <be_setup.h>
#endif
#ifdef HAIKU_TARGET_PLATFORM_LIBBE_TEST #if defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST) || defined(HAIKU_HOST_PLATFORM_DANO)
# define _BE_ERRNO_H_ # define _BE_ERRNO_H_
// this is what Dano/Zeta is using // this is what Dano/Zeta is using
# include <Errors.h> # include <Errors.h>
#endif #endif
#include <sys/types.h>
#include <SupportDefs.h>
#include <string.h> #include <string.h>
// no addr_t under standard BeOS // no addr_t under standard BeOS
@@ -117,14 +121,17 @@ extern float roundf(float value);
// These are R1-specific extensions // These are R1-specific extensions
#ifndef HAIKU_TARGET_PLATFORM_LIBBE_TEST #ifndef HAIKU_TARGET_PLATFORM_LIBBE_TEST
# define B_TRANSLATION_MAKE_VERSION(major,minor,revision) ((major << 8) | ((minor << 4) & 0xf0) | (revision & 0x0f)) # define B_TRANSLATION_MAKE_VERSION(major, minor, revision) \
((major << 8) | ((minor << 4) & 0xf0) | (revision & 0x0f))
# define B_TRANSLATION_MAJOR_VERSION(v) (v >> 8) # define B_TRANSLATION_MAJOR_VERSION(v) (v >> 8)
# define B_TRANSLATION_MINOR_VERSION(v) ((v >> 4) & 0xf) # define B_TRANSLATION_MINOR_VERSION(v) ((v >> 4) & 0xf)
# define B_TRANSLATION_REVISION_VERSION(v) (v & 0xf) # define B_TRANSLATION_REVISION_VERSION(v) (v & 0xf)
# define B_LARGE_ICON_TYPE 'ICON' # ifndef HAIKU_HOST_PLATFORM_DANO
# define B_MINI_ICON_TYPE 'MICN' # define B_LARGE_ICON_TYPE 'ICON'
# define B_VECTOR_ICON_TYPE 'VICN' # define B_MINI_ICON_TYPE 'MICN'
# define B_BITMAP_NO_SERVER_LINK 0 # define B_VECTOR_ICON_TYPE 'VICN'
# define B_BITMAP_NO_SERVER_LINK 0
# endif
#endif // HAIKU_TARGET_PLATFORM_LIBBE_TEST #endif // HAIKU_TARGET_PLATFORM_LIBBE_TEST
#if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE) #if defined(HAIKU_TARGET_PLATFORM_BEOS) || defined(HAIKU_TARGET_PLATFORM_BONE)
@@ -135,10 +142,9 @@ extern float roundf(float value);
#endif #endif
#if !defined(HAIKU_TARGET_PLATFORM_HAIKU) && !defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST) #if !defined(HAIKU_TARGET_PLATFORM_HAIKU) && !defined(HAIKU_TARGET_PLATFORM_LIBBE_TEST)
# ifndef B_VECTOR_ICON_TYPE # ifndef HAIKU_HOST_PLATFORM_DANO
# define B_VECTOR_ICON_TYPE 'VICN' # define B_NOT_SUPPORTED (B_ERROR)
# endif # endif
# define B_NOT_SUPPORTED (B_ERROR)
# define B_KERNEL_READ_AREA 0 # define B_KERNEL_READ_AREA 0
# define B_KERNEL_WRITE_AREA 0 # define B_KERNEL_WRITE_AREA 0
#endif #endif
src/build/libhaikucompat/Jamfile
+3
View File
@@ -28,6 +28,9 @@ if $(HOST_PLATFORM) in r5 bone dano {
if $(HOST_PLATFORM) = dano { if $(HOST_PLATFORM) = dano {
ObjectDefines $(libbePatchSources) : _IMPEXP_BE= ; ObjectDefines $(libbePatchSources) : _IMPEXP_BE= ;
} }
ObjectC++Flags $(libbePatchSources)
: -include [ FDirName $(HAIKU_TOP) headers build
HaikuBuildCompatibility.h ] ;
} }
BuildPlatformStaticLibrary libhaikucompat_build.a : BuildPlatformStaticLibrary libhaikucompat_build.a :
src/tools/Jamfile
+4 -1
View File
@@ -22,7 +22,10 @@ USES_BE_API on $(tools) = true ;
# TODO: temporary kludge # TODO: temporary kludge
local libHaikuCompat ; local libHaikuCompat ;
if $(HOST_PLATFORM) in r5 bone dano { if $(HOST_PLATFORM) in r5 bone dano {
UseHeaders [ FDirName $(HAIKU_TOP) headers build os support ] : true ; ObjectC++Flags database_support.cpp UpdateMimeInfoThread.cpp
MimeUpdateThread.cpp
: -include [ FDirName $(HAIKU_TOP) headers build
HaikuBuildCompatibility.h ] ;
libHaikuCompat = libhaikucompat_build.a ; libHaikuCompat = libhaikucompat_build.a ;
} }