mirror of
https://review.haiku-os.org/haiku
synced 2024-11-23 07:18:40 +01:00
Removal of non-Haiku target platform logic from build system (part 1.)
Following recent changes to use libroot_build on Haiku also, it is now actually impossible to build Haiku components on non-Haiku platforms (BeOS R5, Dan0, BONE, Zeta), so we can remove any logic related to this. This is only the first part; still to be removed are: * SetSubDirSupportedPlatformsBeOSCompatible * HOST_PLATFORM_BEOS_COMPATIBLE * TARGET_PLATFORM_BEOS_COMPATIBLE
This commit is contained in:
Augustin Cavalier
parent
1446507ce3
commit
8a9e1e0d4a
@ -402,8 +402,7 @@ HOST_PRIVATE_KERNEL_HEADERS = ;
|
||||
HOST_PRIVATE_SYSTEM_HEADERS = ;
|
||||
|
||||
# under BeOS use copyattr instead of cp
|
||||
if $(HOST_PLATFORM_BEOS_COMPATIBLE)
|
||||
{
|
||||
if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
|
||||
CP = copyattr --data ;
|
||||
}
|
||||
|
||||
@ -531,14 +530,6 @@ if $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
|
||||
HOST_NETWORK_LIBS = network ;
|
||||
HOST_NETAPI_LIB = bnetapi ;
|
||||
HOST_SELECT_UNAME_ETC_LIB = ; # libroot
|
||||
} else if $(HOST_PLATFORM_BONE_COMPATIBLE) {
|
||||
HOST_NETWORK_LIBS = socket bind ;
|
||||
HOST_NETAPI_LIB = bnetapi ;
|
||||
HOST_SELECT_UNAME_ETC_LIB = ; # libroot
|
||||
} else if $(HOST_PLATFORM_BEOS_COMPATIBLE) {
|
||||
HOST_NETWORK_LIBS = net ;
|
||||
HOST_NETAPI_LIB = netapi ;
|
||||
HOST_SELECT_UNAME_ETC_LIB = net ;
|
||||
} else if $(HOST_PLATFORM) = "sunos" {
|
||||
HOST_NETWORK_LIBS = xnet ;
|
||||
HOST_NETAPI_LIB = ;
|
||||
@ -601,7 +592,7 @@ HOST_BE_API_HEADERS =
|
||||
[ FDirName $(HAIKU_TOP) headers build os support ]
|
||||
[ FDirName $(HAIKU_TOP) headers build private ]
|
||||
;
|
||||
if ! $(HOST_PLATFORM_BEOS_COMPATIBLE) {
|
||||
if ! $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
|
||||
HOST_BE_API_CCFLAGS = -include BeOSBuildCompatibility.h ;
|
||||
HOST_BE_API_C++FLAGS = $(HOST_BE_API_CCFLAGS) ;
|
||||
}
|
||||
@ -613,15 +604,6 @@ if ! $(HOST_PLATFORM_BEOS_COMPATIBLE) {
|
||||
# check the target platform compatibility
|
||||
SetPlatformCompatibilityFlagVariables TARGET_PLATFORM : TARGET : target ;
|
||||
|
||||
# check the compatibility between host and target platform
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
if ! $(HOST_PLATFORM_($(TARGET_PLATFORM))_COMPATIBLE) {
|
||||
Exit ERROR: The host platform is not compatible with target platform
|
||||
$(TARGET_PLATFORM). ;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
# Haiku architecture is undefined on host-only builds
|
||||
# set here to host arch to prevent recusive loops.
|
||||
if $(HAIKU_HOST_BUILD_ONLY) = 1 {
|
||||
@ -680,68 +662,36 @@ local archDependentBuildVars =
|
||||
DEBUG_$(HAIKU_DEBUG_LEVELS)_OBJECT_DIR
|
||||
;
|
||||
|
||||
if $(TARGET_PLATFORM) = haiku {
|
||||
local var ;
|
||||
for var in $(buildVars) {
|
||||
TARGET_$(var) = $(HAIKU_$(var)) ;
|
||||
}
|
||||
# target platform setup
|
||||
local var ;
|
||||
for var in $(buildVars) {
|
||||
TARGET_$(var) = $(HAIKU_$(var)) ;
|
||||
}
|
||||
|
||||
for var in $(archDependentBuildVars)_$(TARGET_PACKAGING_ARCHS) {
|
||||
TARGET_$(var) = $(HAIKU_$(var)) ;
|
||||
}
|
||||
for var in $(archDependentBuildVars)_$(TARGET_PACKAGING_ARCHS) {
|
||||
TARGET_$(var) = $(HAIKU_$(var)) ;
|
||||
}
|
||||
|
||||
TARGET_BOOT_LIBGCC = $(HAIKU_BOOT_LIBGCC_$(TARGET_PACKAGING_ARCH)) ;
|
||||
TARGET_BOOT_LIBSUPC++ = $(HAIKU_BOOT_LIBSUPC++_$(TARGET_PACKAGING_ARCH)) ;
|
||||
TARGET_BOOT_LIBGCC = $(HAIKU_BOOT_LIBGCC_$(TARGET_PACKAGING_ARCH)) ;
|
||||
TARGET_BOOT_LIBSUPC++ = $(HAIKU_BOOT_LIBSUPC++_$(TARGET_PACKAGING_ARCH)) ;
|
||||
|
||||
TARGET_BOOT_PLATFORM ?= $(HAIKU_BOOT_PLATFORM) ;
|
||||
TARGET_BOOT_PLATFORM ?= $(HAIKU_BOOT_PLATFORM) ;
|
||||
|
||||
local architecture ;
|
||||
for architecture in $(TARGET_PACKAGING_ARCHS) {
|
||||
TARGET_DEFINES_$(architecture) = $(HAIKU_DEFINES_$(architecture)) ;
|
||||
TARGET_LIBRARY_NAME_MAP_$(architecture)
|
||||
= HAIKU_LIBRARY_NAME_MAP_$(architecture) ;
|
||||
}
|
||||
} else {
|
||||
local var ;
|
||||
for var in $(buildVars) {
|
||||
TARGET_$(var) = $(HOST_$(var)) ;
|
||||
}
|
||||
|
||||
for var in $(archDependentBuildVars) {
|
||||
TARGET_$(var)_$(TARGET_PACKAGING_ARCH) = $(HOST_$(var)) ;
|
||||
}
|
||||
|
||||
TARGET_BOOT_LIBGCC = ;
|
||||
TARGET_BOOT_LIBSUPC++ = ;
|
||||
|
||||
TARGET_BOOT_PLATFORM = ;
|
||||
|
||||
TARGET_DEFINES_$(TARGET_PACKAGING_ARCH) = ;
|
||||
# all flags are in TARGET_DEFINES
|
||||
|
||||
TARGET_LIBRARY_NAME_MAP_$(TARGET_PACKAGING_ARCH) = HOST_LIBRARY_NAME_MAP ;
|
||||
local architecture ;
|
||||
for architecture in $(TARGET_PACKAGING_ARCHS) {
|
||||
TARGET_DEFINES_$(architecture) = $(HAIKU_DEFINES_$(architecture)) ;
|
||||
TARGET_LIBRARY_NAME_MAP_$(architecture)
|
||||
= HAIKU_LIBRARY_NAME_MAP_$(architecture) ;
|
||||
}
|
||||
|
||||
# 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_host : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_HAIKU ;
|
||||
case haiku : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_HAIKU ;
|
||||
case linux : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_LINUX ;
|
||||
case freebsd : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_FREEBSD ;
|
||||
case darwin : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_DARWIN ;
|
||||
case cygwin : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_CYGWIN ;
|
||||
case sunos : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_SUNOS ;
|
||||
case libbe_test : TARGET_DEFINES += HAIKU_TARGET_PLATFORM_LIBBE_TEST ;
|
||||
}
|
||||
|
||||
# define macro, for identifying the host platform
|
||||
switch $(HOST_PLATFORM) {
|
||||
case r5 : HOST_DEFINES += HAIKU_HOST_PLATFORM_BEOS ;
|
||||
case bone : HOST_DEFINES += HAIKU_HOST_PLATFORM_BONE ;
|
||||
case dano : HOST_DEFINES += HAIKU_HOST_PLATFORM_DANO ;
|
||||
case haiku_host : HOST_DEFINES += HAIKU_HOST_PLATFORM_HAIKU ;
|
||||
case linux : HOST_DEFINES += HAIKU_HOST_PLATFORM_LINUX ;
|
||||
case freebsd : HOST_DEFINES += HAIKU_HOST_PLATFORM_FREEBSD ;
|
||||
@ -761,21 +711,6 @@ HOST_DEFINES += HAIKU_PACKAGING_ARCH=\\\"$(HAIKU_PACKAGING_ARCH)\\\" ;
|
||||
|
||||
#pragma mark -
|
||||
|
||||
# In case we build for a BeOS compatible platform, but not for Haiku, we
|
||||
# include the HaikuBuildCompatibility.h header and link against
|
||||
# libhaikucompat.a.
|
||||
|
||||
if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) && $(TARGET_PLATFORM_BEOS_COMPATIBLE) {
|
||||
# headers and flags
|
||||
local compatibilityHeader = -include [ FDirName $(HAIKU_TOP) headers build
|
||||
HaikuBuildCompatibility.h ] ;
|
||||
TARGET_CCFLAGS_$(TARGET_PACKAGING_ARCH) += $(compatibilityHeader) ;
|
||||
TARGET_C++FLAGS_$(TARGET_PACKAGING_ARCH) += $(compatibilityHeader) ;
|
||||
|
||||
# compatibility library
|
||||
TARGET_HAIKU_COMPATIBILITY_LIBS = libhaikucompat.a ;
|
||||
}
|
||||
|
||||
# special target libbe_test
|
||||
|
||||
if $(TARGET_PLATFORM) = libbe_test {
|
||||
|
||||
@ -59,7 +59,7 @@ rule Link
|
||||
# rid of the attributes. When using the generic attribute emulation, which
|
||||
# uses separate files, we need to remove the target explicitely first, so that
|
||||
# the attributes won't be "leaked".
|
||||
if $(HOST_PLATFORM_BEOS_COMPATIBLE) || $(HAIKU_HOST_USE_XATTR) = 1 {
|
||||
if $(HAIKU_HOST_USE_XATTR) = 1 {
|
||||
actions Link bind NEEDLIBS LINK_BEGIN_GLUE LINK_END_GLUE VERSION_SCRIPT
|
||||
{
|
||||
$(LINK) $(LINKFLAGS) -o "$(1)" $(UNDEFS) "$(LINK_BEGIN_GLUE)" "$(2)" \
|
||||
|
||||
4
configure
vendored
4
configure
vendored
@ -72,9 +72,6 @@ options:
|
||||
on to the make building the build tools.
|
||||
--no-downloads Do not download anything. Useful when trying to
|
||||
bootstrap and build Haiku from source only.
|
||||
--target=TARGET Select build target platform.
|
||||
[default=${TARGET_PLATFORM}]
|
||||
valid targets=r5,bone,dano,haiku
|
||||
--target-arch <arch> Haiku only: Specify the target architecture to
|
||||
build for. Must be one of the architectures of the
|
||||
host system. The installed build tools for that
|
||||
@ -675,7 +672,6 @@ while [ $# -gt 0 ] ; do
|
||||
--include-3rdparty) HAIKU_INCLUDE_3RDPARTY=1; shift 1;;
|
||||
-j*) buildCrossToolsJobs="$1"; shift 1;;
|
||||
--no-downloads) HAIKU_NO_DOWNLOADS=1; shift 1;;
|
||||
--target=*) TARGET_PLATFORM=`echo $1 | cut -d'=' -f2-`; shift 1;;
|
||||
--target-arch)
|
||||
assertparam "$1" $#
|
||||
targetArch=$2
|
||||
|
||||
@ -513,15 +513,8 @@ get_cpu_type(char *vendorBuffer, size_t vendorSize, char *modelBuffer,
|
||||
if (model == NULL)
|
||||
model = "Unknown";
|
||||
|
||||
#ifdef R5_COMPATIBLE
|
||||
strncpy(vendorBuffer, vendor, vendorSize - 1);
|
||||
vendorBuffer[vendorSize - 1] = '\0';
|
||||
strncpy(modelBuffer, model, modelSize - 1);
|
||||
modelBuffer[modelSize - 1] = '\0';
|
||||
#else
|
||||
strlcpy(vendorBuffer, vendor, vendorSize);
|
||||
strlcpy(modelBuffer, model, modelSize);
|
||||
#endif
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -3,17 +3,13 @@ SubDir HAIKU_TOP src add-ons input_server methods pen ;
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
UsePrivateHeaders interface ;
|
||||
|
||||
#SubDirSysHdrs $(SUBDIR) ;
|
||||
if $(TARGET_PLATFORM) != dano {
|
||||
SubDirSysHdrs [ FDirName $(SUBDIR) compat ] ;
|
||||
}
|
||||
SubDirSysHdrs [ FDirName $(SUBDIR) compat ] ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
SubDirC++Flags -fmultiple-symbol-spaces ;
|
||||
}
|
||||
|
||||
Addon pen :
|
||||
Addon pen :
|
||||
PenInputServerMethod.cpp
|
||||
PenInputLooper.cpp
|
||||
PenInputInkWindow.cpp
|
||||
|
||||
@ -7,15 +7,7 @@ SubDirC++Flags -fno-rtti ;
|
||||
local compatSources ;
|
||||
|
||||
SubDirSysHdrs $(SUBDIR) ;
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UsePrivateHeaders kernel ;
|
||||
UsePublicHeaders drivers ;
|
||||
if ! $(HOST_PLATFORM_HAIKU_COMPATIBLE) {
|
||||
compatSources = kernel_cpp.cpp ;
|
||||
}
|
||||
} else {
|
||||
UsePrivateKernelHeaders ;
|
||||
}
|
||||
UsePrivateKernelHeaders ;
|
||||
|
||||
KernelStaticLibrary libusb.a :
|
||||
Stack.cpp
|
||||
|
||||
@ -2,10 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel busses scsi usb ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UsePublicHeaders [ FDirName drivers ] ;
|
||||
}
|
||||
|
||||
UsePrivateHeaders drivers ;
|
||||
|
||||
KernelAddon usb_scsi :
|
||||
|
||||
@ -2,11 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel drivers audio echo 24 ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os drivers ] : true ;
|
||||
# We need the public pcmcia headers also when not compiling for Haiku.
|
||||
}
|
||||
|
||||
SubDirHdrs $(HAIKU_TOP) src add-ons kernel drivers audio echo ;
|
||||
SubDirHdrs $(HAIKU_TOP) src add-ons kernel drivers audio echo generic ;
|
||||
SubDirHdrs $(HAIKU_TOP) src add-ons kernel drivers audio echo generic DSP ;
|
||||
@ -70,7 +65,7 @@ SEARCH on [ FGristFiles
|
||||
] = [ FDirName $(HAIKU_TOP) src add-ons kernel drivers audio echo generic ] ;
|
||||
|
||||
SEARCH on [ FGristFiles
|
||||
kernel_cpp.cpp
|
||||
kernel_cpp.cpp
|
||||
] = [ FDirName $(HAIKU_TOP) src system kernel util ] ;
|
||||
|
||||
SEARCH on [ FGristFiles
|
||||
|
||||
@ -2,11 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel drivers audio echo 3g ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os drivers ] : true ;
|
||||
# We need the public pcmcia headers also when not compiling for Haiku.
|
||||
}
|
||||
|
||||
SubDirHdrs $(HAIKU_TOP) src add-ons kernel drivers audio echo ;
|
||||
SubDirHdrs $(HAIKU_TOP) src add-ons kernel drivers audio echo generic ;
|
||||
SubDirHdrs $(HAIKU_TOP) src add-ons kernel drivers audio echo generic DSP ;
|
||||
|
||||
@ -2,11 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel drivers audio echo gals ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os drivers ] : true ;
|
||||
# We need the public pcmcia headers also when not compiling for Haiku.
|
||||
}
|
||||
|
||||
SubDirHdrs $(HAIKU_TOP) src add-ons kernel drivers audio echo ;
|
||||
SubDirHdrs $(HAIKU_TOP) src add-ons kernel drivers audio echo generic ;
|
||||
SubDirHdrs $(HAIKU_TOP) src add-ons kernel drivers audio echo generic DSP ;
|
||||
@ -68,7 +63,7 @@ SEARCH on [ FGristFiles
|
||||
] = [ FDirName $(HAIKU_TOP) src add-ons kernel drivers audio echo generic ] ;
|
||||
|
||||
SEARCH on [ FGristFiles
|
||||
kernel_cpp.cpp
|
||||
kernel_cpp.cpp
|
||||
] = [ FDirName $(HAIKU_TOP) src system kernel util ] ;
|
||||
|
||||
SEARCH on [ FGristFiles
|
||||
|
||||
@ -2,11 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel drivers audio echo indigo ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os drivers ] : true ;
|
||||
# We need the public pcmcia headers also when not compiling for Haiku.
|
||||
}
|
||||
|
||||
SubDirHdrs $(HAIKU_TOP) src add-ons kernel drivers audio echo ;
|
||||
SubDirHdrs $(HAIKU_TOP) src add-ons kernel drivers audio echo generic ;
|
||||
SubDirHdrs $(HAIKU_TOP) src add-ons kernel drivers audio echo generic DSP ;
|
||||
@ -63,7 +58,7 @@ SEARCH on [ FGristFiles
|
||||
] = [ FDirName $(HAIKU_TOP) src add-ons kernel drivers audio echo generic ] ;
|
||||
|
||||
SEARCH on [ FGristFiles
|
||||
kernel_cpp.cpp
|
||||
kernel_cpp.cpp
|
||||
] = [ FDirName $(HAIKU_TOP) src system kernel util ] ;
|
||||
|
||||
SEARCH on [ FGristFiles
|
||||
|
||||
@ -5,27 +5,10 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
UsePrivateHeaders net kernel bluetooth ;
|
||||
UsePrivateKernelHeaders ;
|
||||
|
||||
local r5_src = ;
|
||||
if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os bluetooth ] : true ;
|
||||
# HACKs HACKs HACKs...
|
||||
# for <bluetooth/*> ...
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os ] : true ;
|
||||
# for <net/*> hmmm...
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers private ] : true ;
|
||||
# for USB_spec.h from Haiku
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os drivers ] : true ;
|
||||
r5_src = list.c ;
|
||||
}
|
||||
|
||||
KernelAddon h2generic :
|
||||
h2generic.cpp
|
||||
h2transactions.cpp
|
||||
h2upper.cpp
|
||||
h2util.cpp
|
||||
snet_buffer.cpp
|
||||
$(r5_src)
|
||||
;
|
||||
|
||||
SEARCH on [ FGristFiles $(r5_src)
|
||||
] = [ FDirName $(HAIKU_TOP) src system kernel util ] ;
|
||||
|
||||
@ -2,13 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel drivers bus pcmcia ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FStandardOSHeaders ] : true ;
|
||||
# Needed for <support/Errors.h> and maybe other stuff.
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os drivers ] : true ;
|
||||
# We need the public pcmcia headers also when not compiling for Haiku.
|
||||
}
|
||||
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers compatibility bsd ] : true ;
|
||||
|
||||
KernelAddon ds :
|
||||
|
||||
@ -4,9 +4,6 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
SubDirSysHdrs $(HAIKU_TOP) src add-ons kernel bus_managers usb ;
|
||||
UsePrivateKernelHeaders ;
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UsePublicHeaders [ FDirName drivers ] ;
|
||||
}
|
||||
|
||||
KernelAddon usb_raw :
|
||||
usb_raw.cpp
|
||||
|
||||
@ -2,15 +2,8 @@ SubDir HAIKU_TOP src add-ons kernel drivers disk virtual nbd ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
# not Haiku-specific, ksocket.h also works in BONE.
|
||||
UsePrivateHeaders drivers ;
|
||||
|
||||
if $(TARGET_PLATFORM) = haiku {
|
||||
# lock.h wants debug.h and others.
|
||||
#UsePrivateHeaders kernel ;
|
||||
#UsePublicHeaders kernel ;
|
||||
UsePrivateKernelHeaders ;
|
||||
}
|
||||
UsePrivateKernelHeaders ;
|
||||
|
||||
KernelAddon nbd :
|
||||
nbd.c
|
||||
|
||||
@ -2,19 +2,9 @@ SubDir HAIKU_TOP src add-ons kernel drivers midi usb_midi ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
local buffer_impl = ;
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os drivers ] : true ;
|
||||
# We need the public usb headers also when not compiling for Haiku.
|
||||
buffer_impl = ring_buffer.cpp ;
|
||||
}
|
||||
UsePrivateHeaders [ FDirName kernel util ] ;
|
||||
|
||||
KernelAddon usb_midi :
|
||||
usb_midi.cpp
|
||||
devlist.cpp
|
||||
$(buffer_impl)
|
||||
;
|
||||
|
||||
SEARCH on [ FGristFiles ring_buffer.cpp ] = [ FDirName $(HAIKU_TOP) src system kernel util ] ;
|
||||
|
||||
|
||||
@ -2,11 +2,9 @@ SubDir HAIKU_TOP src add-ons kernel drivers ports pc_serial ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
|
||||
UsePrivateHeaders libroot ;
|
||||
UsePrivateKernelHeaders ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os drivers tty ] : true ;
|
||||
}
|
||||
UsePrivateHeaders libroot ;
|
||||
UsePrivateKernelHeaders ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os drivers tty ] : true ;
|
||||
|
||||
SubDirC++Flags -fno-rtti ;
|
||||
|
||||
|
||||
@ -2,12 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel drivers power acpi_thermal ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
# Needed for <ACPI.h>. Unfortunately we also get the other headers there,
|
||||
# that we don't really want.
|
||||
UsePublicHeaders drivers ;
|
||||
}
|
||||
|
||||
KernelAddon acpi_thermal :
|
||||
acpi_thermal.c
|
||||
;
|
||||
|
||||
@ -2,11 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel generic dpc ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UsePublicHeaders [ FDirName drivers ] ;
|
||||
}
|
||||
|
||||
KernelAddon dpc :
|
||||
dpc.c
|
||||
;
|
||||
|
||||
|
||||
@ -2,14 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel network datalink_protocols arp ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FStandardOSHeaders ] : true ;
|
||||
# Needed for <support/Errors.h> and maybe other stuff.
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
|
||||
# We need the public network headers also when not compiling for Haiku.
|
||||
# Unfortunately we get more than we want, namely all POSIX headers.
|
||||
}
|
||||
|
||||
UsePrivateKernelHeaders ;
|
||||
UsePrivateHeaders net ;
|
||||
|
||||
|
||||
@ -2,14 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel network datalink_protocols ethernet_frame ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FStandardOSHeaders ] : true ;
|
||||
# Needed for <support/Errors.h> and maybe other stuff.
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
|
||||
# We need the public network headers also when not compiling for Haiku.
|
||||
# Unfortunately we get more than we want, namely all POSIX headers.
|
||||
}
|
||||
|
||||
UsePrivateKernelHeaders ;
|
||||
UsePrivateHeaders net ;
|
||||
|
||||
|
||||
@ -2,14 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel network datalink_protocols ipv6_datagram ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FStandardOSHeaders ] : true ;
|
||||
# Needed for <support/Errors.h> and maybe other stuff.
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
|
||||
# We need the public network headers also when not compiling for Haiku.
|
||||
# Unfortunately we get more than we want, namely all POSIX headers.
|
||||
}
|
||||
|
||||
UsePrivateKernelHeaders ;
|
||||
UsePrivateHeaders kernel net ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols ] : true ;
|
||||
|
||||
@ -2,14 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel network datalink_protocols loopback_frame ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FStandardOSHeaders ] : true ;
|
||||
# Needed for <support/Errors.h> and maybe other stuff.
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
|
||||
# We need the public network headers also when not compiling for Haiku.
|
||||
# Unfortunately we get more than we want, namely all POSIX headers.
|
||||
}
|
||||
|
||||
UsePrivateKernelHeaders ;
|
||||
UsePrivateHeaders net ;
|
||||
|
||||
|
||||
@ -2,14 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel network devices dialup ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FStandardOSHeaders ] : true ;
|
||||
# Needed for <support/Errors.h> and maybe other stuff.
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
|
||||
# We need the public network headers also when not compiling for Haiku.
|
||||
# Unfortunately we get more than we want, namely all POSIX headers.
|
||||
}
|
||||
|
||||
UsePrivateKernelHeaders ;
|
||||
UsePrivateHeaders net ;
|
||||
|
||||
|
||||
@ -2,14 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel network devices ethernet ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FStandardOSHeaders ] : true ;
|
||||
# Needed for <support/Errors.h> and maybe other stuff.
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
|
||||
# We need the public network headers also when not compiling for Haiku.
|
||||
# Unfortunately we get more than we want, namely all POSIX headers.
|
||||
}
|
||||
|
||||
UsePrivateKernelHeaders ;
|
||||
UsePrivateHeaders net ;
|
||||
|
||||
|
||||
@ -2,14 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel network devices loopback ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FStandardOSHeaders ] : true ;
|
||||
# Needed for <support/Errors.h> and maybe other stuff.
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
|
||||
# We need the public network headers also when not compiling for Haiku.
|
||||
# Unfortunately we get more than we want, namely all POSIX headers.
|
||||
}
|
||||
|
||||
UsePrivateKernelHeaders ;
|
||||
UsePrivateHeaders net ;
|
||||
|
||||
|
||||
@ -2,14 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel network protocols icmp6 ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FStandardOSHeaders ] : true ;
|
||||
# Needed for <support/Errors.h> and maybe other stuff.
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
|
||||
# We need the public network headers also when not compiling for Haiku.
|
||||
# Unfortunately we get more than we want, namely all POSIX headers.
|
||||
}
|
||||
|
||||
UsePrivateKernelHeaders ;
|
||||
UsePrivateHeaders net ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network protocols ] : true ;
|
||||
|
||||
@ -2,14 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel network protocols ipv4 ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FStandardOSHeaders ] : true ;
|
||||
# Needed for <support/Errors.h> and maybe other stuff.
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
|
||||
# We need the public network headers also when not compiling for Haiku.
|
||||
# Unfortunately we get more than we want, namely all POSIX headers.
|
||||
}
|
||||
|
||||
UsePrivateKernelHeaders ;
|
||||
UsePrivateHeaders net ;
|
||||
|
||||
|
||||
@ -2,14 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel network protocols ipv6 ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FStandardOSHeaders ] : true ;
|
||||
# Needed for <support/Errors.h> and maybe other stuff.
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
|
||||
# We need the public network headers also when not compiling for Haiku.
|
||||
# Unfortunately we get more than we want, namely all POSIX headers.
|
||||
}
|
||||
|
||||
UsePrivateKernelHeaders ;
|
||||
UsePrivateHeaders net ;
|
||||
|
||||
|
||||
@ -2,14 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel network protocols l2cap ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FStandardOSHeaders ] : true ;
|
||||
# Needed for <support/Errors.h> and maybe other stuff.
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
|
||||
# We need the public network headers also when not compiling for Haiku.
|
||||
# Unfortunately we get more than we want, namely all POSIX headers.
|
||||
}
|
||||
|
||||
UsePrivateKernelHeaders ;
|
||||
UsePrivateHeaders net bluetooth ;
|
||||
|
||||
|
||||
@ -2,14 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel network protocols tcp ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FStandardOSHeaders ] : true ;
|
||||
# Needed for <support/Errors.h> and maybe other stuff.
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
|
||||
# We need the public network headers also when not compiling for Haiku.
|
||||
# Unfortunately we get more than we want, namely all POSIX headers.
|
||||
}
|
||||
|
||||
UsePrivateKernelHeaders ;
|
||||
UsePrivateHeaders net ;
|
||||
|
||||
|
||||
@ -2,14 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel network protocols udp ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FStandardOSHeaders ] : true ;
|
||||
# Needed for <support/Errors.h> and maybe other stuff.
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
|
||||
# We need the public network headers also when not compiling for Haiku.
|
||||
# Unfortunately we get more than we want, namely all POSIX headers.
|
||||
}
|
||||
|
||||
UsePrivateKernelHeaders ;
|
||||
UsePrivateHeaders net ;
|
||||
|
||||
|
||||
@ -2,15 +2,6 @@ SubDir HAIKU_TOP src add-ons kernel network stack ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FStandardOSHeaders ] : true ;
|
||||
# Needed for <support/Errors.h> and maybe other stuff.
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
|
||||
# We need the public network headers also when not compiling for Haiku.
|
||||
# Unfortunately we get more than we want, namely all POSIX headers.
|
||||
}
|
||||
|
||||
|
||||
UseHeaders $(TARGET_PRIVATE_KERNEL_HEADERS) : true ;
|
||||
UsePrivateHeaders net shared ;
|
||||
|
||||
|
||||
@ -2,10 +2,6 @@ SubDir HAIKU_TOP src add-ons mail_daemon inbound_protocols imap ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UsePublicHeaders mail ;
|
||||
}
|
||||
|
||||
UsePublicHeaders [ FDirName add-ons mail_daemon ] ;
|
||||
UsePrivateHeaders mail shared ;
|
||||
SubDirHdrs [ FDirName $(SUBDIR) imap_lib ] ;
|
||||
|
||||
@ -1,9 +1,5 @@
|
||||
SubDir HAIKU_TOP src add-ons mail_daemon inbound_protocols pop3 ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UsePublicHeaders mail ;
|
||||
}
|
||||
|
||||
UsePublicHeaders [ FDirName add-ons mail_daemon ] ;
|
||||
UsePrivateHeaders mail shared ;
|
||||
|
||||
|
||||
@ -4,10 +4,6 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
UsePrivateHeaders media ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
SubDirC++Flags -fmultiple-symbol-spaces -D_ZETA_TS_FIND_DIR_=1 ;
|
||||
}
|
||||
|
||||
local architectureObject ;
|
||||
for architectureObject in [ MultiArchSubDirSetup ] {
|
||||
on $(architectureObject) {
|
||||
|
||||
@ -3,14 +3,6 @@ SubDir HAIKU_TOP src apps login ;
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
UsePrivateHeaders app interface ;
|
||||
#UsePrivateHeaders shared ;
|
||||
#UsePrivateHeaders tracker ;
|
||||
#SubDirHdrs $(HAIKU_TOP) src kits tracker ;
|
||||
local mu_libs ;
|
||||
if $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
|
||||
mu_libs = libmultiuser_utils.a ;
|
||||
}
|
||||
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src bin multiuser ] ;
|
||||
|
||||
Application Login :
|
||||
@ -19,7 +11,7 @@ Application Login :
|
||||
LoginWindow.cpp
|
||||
LoginView.cpp
|
||||
main.cpp
|
||||
: be tracker $(mu_libs) [ TargetLibstdc++ ] localestub
|
||||
: be tracker libmultiuser_utils.a [ TargetLibstdc++ ] localestub
|
||||
: Login.rdef
|
||||
;
|
||||
|
||||
|
||||
@ -1,9 +1,5 @@
|
||||
SubDir HAIKU_TOP src apps mail ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UsePublicHeaders mail ;
|
||||
}
|
||||
|
||||
UsePrivateHeaders interface ;
|
||||
UsePrivateHeaders mail ;
|
||||
UsePrivateHeaders textencoding ;
|
||||
|
||||
@ -2,13 +2,6 @@ SubDir HAIKU_TOP src apps pulse ;
|
||||
|
||||
UsePrivateSystemHeaders ;
|
||||
UsePrivateHeaders shared interface app ;
|
||||
if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) {
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os kernel ] : true ;
|
||||
}
|
||||
|
||||
if $(TARGET_PLATFORM) = r5 {
|
||||
SubDirC++Flags -DR5_COMPATIBLE ;
|
||||
}
|
||||
|
||||
Application Pulse :
|
||||
ConfigView.cpp
|
||||
|
||||
@ -5,12 +5,6 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
UsePrivateHeaders shared ;
|
||||
UsePrivateHeaders storage ;
|
||||
|
||||
local additionalBeOSSources ;
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src kits storage ] ;
|
||||
additionalBeOSSources += PathMonitor.cpp ;
|
||||
}
|
||||
|
||||
Application TextSearch :
|
||||
ChangesIterator.cpp
|
||||
FileIterator.cpp
|
||||
@ -21,9 +15,6 @@ Application TextSearch :
|
||||
GrepWindow.cpp
|
||||
Model.cpp
|
||||
TextSearch.cpp
|
||||
|
||||
$(additionalBeOSSources)
|
||||
|
||||
: be localestub tracker textencoding shared
|
||||
[ TargetLibsupc++ ]
|
||||
: TextSearch.rdef
|
||||
|
||||
@ -56,7 +56,6 @@ StdBinCommands
|
||||
|
||||
# Commands which don't need another library that depend on
|
||||
# Haiku-specific code
|
||||
if $(TARGET_PLATFORM) = haiku {
|
||||
StdBinCommands
|
||||
boot_process_done.cpp
|
||||
fdinfo.cpp
|
||||
@ -66,7 +65,6 @@ StdBinCommands
|
||||
safemode.c
|
||||
unmount.c
|
||||
: : $(haiku-utils_rsrc) ;
|
||||
}
|
||||
|
||||
# standard commands that need libncurses.a
|
||||
Includes [ FGristFiles top.cpp watch.c ]
|
||||
@ -152,12 +150,10 @@ StdBinCommands
|
||||
: be [ TargetLibsupc++ ] localestub : $(haiku-utils_rsrc) ;
|
||||
|
||||
# Haiku-specific apps which need libbe.so
|
||||
if $(TARGET_PLATFORM) = haiku {
|
||||
StdBinCommands
|
||||
isvolume.cpp
|
||||
shutdown.cpp
|
||||
: be : $(haiku-utils_rsrc) ;
|
||||
}
|
||||
|
||||
# standard commands that need libbe.so, libstdc++.so
|
||||
StdBinCommands
|
||||
@ -167,11 +163,9 @@ StdBinCommands
|
||||
: be [ TargetLibstdc++ ] : $(haiku-utils_rsrc) ;
|
||||
|
||||
# Haiku-specific apps which need libbe.so, libstdc++.so
|
||||
if $(TARGET_PLATFORM) = haiku {
|
||||
StdBinCommands
|
||||
mountvolume.cpp
|
||||
: be [ TargetLibstdc++ ] : $(haiku-utils_rsrc) ;
|
||||
}
|
||||
|
||||
# commands that need libstdc++ only
|
||||
StdBinCommands
|
||||
|
||||
@ -2,10 +2,6 @@ SubDir HAIKU_TOP src bin mail_utils ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UsePublicHeaders mail ;
|
||||
}
|
||||
|
||||
UsePrivateHeaders mail ;
|
||||
|
||||
StdBinCommands
|
||||
|
||||
@ -2,11 +2,6 @@ SubDir HAIKU_TOP src kits media ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os media ] : true ;
|
||||
# We need the public media headers also when not compiling for Haiku.
|
||||
}
|
||||
|
||||
UsePrivateHeaders app media shared ;
|
||||
UsePrivateHeaders [ FDirName media experimental ] ;
|
||||
|
||||
|
||||
@ -2,12 +2,6 @@ SubDir HAIKU_TOP src kits midi ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os midi ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os midi2 ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os ] : true ;
|
||||
}
|
||||
|
||||
UsePrivateHeaders midi ;
|
||||
|
||||
|
||||
|
||||
@ -2,11 +2,6 @@ SubDir HAIKU_TOP src kits midi2 ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os midi2 ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
|
||||
}
|
||||
|
||||
UsePrivateHeaders midi ;
|
||||
|
||||
local architectureObject ;
|
||||
|
||||
@ -17,12 +17,6 @@ SubDirC++Flags
|
||||
local architectureObject ;
|
||||
for architectureObject in [ MultiArchSubDirSetup ] {
|
||||
on $(architectureObject) {
|
||||
local vectorIconLibs ;
|
||||
if ! $(TARGET_PLATFORM_HAIKU_COMPATIBLE) && $(TARGET_PLATFORM)
|
||||
!= libbe_test {
|
||||
vectorIconLibs = [ MultiArchDefaultGristFiles libicon.a libagg.a ] ;
|
||||
}
|
||||
|
||||
local libtracker = [ MultiArchDefaultGristFiles libtracker.so ] ;
|
||||
AddResources $(libtracker) : TrackerIcons.rdef libtracker.rdef ;
|
||||
|
||||
@ -101,7 +95,7 @@ for architectureObject in [ MultiArchSubDirSetup ] {
|
||||
WidgetAttributeText.cpp
|
||||
|
||||
:
|
||||
be localestub shared translation $(vectorIconLibs)
|
||||
be localestub shared translation
|
||||
[ TargetLibstdc++ ] [ TargetLibsupc++ ]
|
||||
[ MultiArchDefaultGristFiles libshortcuts_shared.a ]
|
||||
;
|
||||
|
||||
@ -3,10 +3,6 @@ SubDir HAIKU_TOP src kits translation ;
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
AddSubDirSupportedPlatforms libbe_test ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UsePublicHeaders translation ;
|
||||
}
|
||||
|
||||
UsePrivateHeaders translation textencoding ;
|
||||
|
||||
local architectureObject ;
|
||||
|
||||
@ -1,7 +1,5 @@
|
||||
SubDir HAIKU_TOP src libs stdc++ ;
|
||||
|
||||
if $(TARGET_PLATFORM) = haiku {
|
||||
if x86_gcc2 in $(TARGET_PACKAGING_ARCHS) {
|
||||
HaikuSubInclude legacy ;
|
||||
}
|
||||
if x86_gcc2 in $(TARGET_PACKAGING_ARCHS) {
|
||||
HaikuSubInclude legacy ;
|
||||
}
|
||||
|
||||
@ -2,14 +2,6 @@ SubDir HAIKU_TOP src tests add-ons kernel network ppp shared libkernelppp ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FStandardOSHeaders ] : true ;
|
||||
# Needed for the atomic_add64() prototype. :-/
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers posix ] : true ;
|
||||
# We need the public network headers also when not compiling for Haiku.
|
||||
# Unfortunately we get more than we want, namely all POSIX headers.
|
||||
}
|
||||
|
||||
UsePrivateHeaders net ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) src add-ons kernel network ppp shared libkernelppp headers ] : true ;
|
||||
|
||||
|
||||
@ -2,11 +2,6 @@ SubDir HAIKU_TOP src tests add-ons opengl fake_renderer ;
|
||||
|
||||
SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os opengl ] : true ;
|
||||
# We need our public GL headers also when not compiling for Haiku.
|
||||
}
|
||||
|
||||
UsePrivateHeaders interface opengl ;
|
||||
|
||||
|
||||
|
||||
@ -4,12 +4,6 @@ SetSubDirSupportedPlatformsBeOSCompatible ;
|
||||
|
||||
UsePrivateHeaders interface ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os interface ] : true ;
|
||||
UseHeaders [ FDirName $(HAIKU_TOP) headers os ] : true ;
|
||||
SubDirC++Flags -D_SetShelf=set_shelf ;
|
||||
}
|
||||
|
||||
SimpleTest ShelfTest :
|
||||
ShelfTest.cpp
|
||||
: be [ TargetLibsupc++ ]
|
||||
|
||||
@ -14,11 +14,6 @@ SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems apple ;
|
||||
SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems gpt ;
|
||||
SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems intel ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UsePublicHeaders drivers ; # disk_device_manager.h
|
||||
UsePublicHeaders storage ; # DiskDeviceDefs.h
|
||||
}
|
||||
|
||||
# we need to redefine certain calls in the boot loader so that
|
||||
# they will really be used instead of their POSIX counterparts
|
||||
# in libroot.so
|
||||
|
||||
@ -9,11 +9,6 @@ UsePrivateHeaders [ FDirName storage ] ;
|
||||
SubDirSysHdrs $(HAIKU_TOP) src tests system boot loader ;
|
||||
SubDirHdrs $(HAIKU_TOP) src system boot loader file_systems amiga_ffs ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UsePublicHeaders drivers ; # disk_device_manager.h
|
||||
UsePublicHeaders storage ; # DiskDeviceDefs.h
|
||||
}
|
||||
|
||||
ObjectDefines
|
||||
amiga_ffs.cpp
|
||||
Volume.cpp
|
||||
|
||||
@ -10,11 +10,6 @@ SubDirSysHdrs $(HAIKU_TOP) src tests system boot loader ;
|
||||
SubDirHdrs $(HAIKU_TOP) src system boot loader file_systems bfs ;
|
||||
SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_systems bfs ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UsePublicHeaders drivers ; # disk_device_manager.h
|
||||
UsePublicHeaders storage ; # DiskDeviceDefs.h
|
||||
}
|
||||
|
||||
ObjectDefines
|
||||
bfs.cpp
|
||||
Directory.cpp
|
||||
|
||||
@ -10,13 +10,6 @@ SubDirSysHdrs $(HAIKU_TOP) src tests system boot loader ;
|
||||
SubDirSysHdrs $(HAIKU_TOP) headers libs zlib ;
|
||||
SubDirHdrs $(HAIKU_TOP) src system boot loader file_systems tarfs ;
|
||||
|
||||
if $(TARGET_PLATFORM) != haiku {
|
||||
UsePublicHeaders drivers ; # disk_device_manager.h
|
||||
UsePublicHeaders storage ; # DiskDeviceDefs.h
|
||||
|
||||
ObjectDefines tarfs.cpp : B_BUFFER_OVERFLOW=B_BAD_VALUE ;
|
||||
}
|
||||
|
||||
ObjectDefines
|
||||
tarfs.cpp
|
||||
:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user