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

Merged changes from branch build_system_redesign at revision 14573.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14574 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold
2005-10-29 16:27:43 +00:00
parent 5412b02d50
commit 338b8dc301
1836 changed files with 114718 additions and 14057 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/loader/Jamfile
+13 -11
View File
@@ -1,7 +1,9 @@
SubDir OBOS_TOP src system boot loader ;
SubDir HAIKU_TOP src system boot loader ;
# SubDirHdrs $(OBOS_TOP) src add-ons kernel partitioning_systems amiga ;
UsePrivateHeaders [ FDirName kernel boot platform $(OBOS_BOOT_PLATFORM) ] ;
SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems amiga ;
SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems apple ;
SubDirHdrs $(HAIKU_TOP) src add-ons kernel partitioning_systems intel ;
UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
UsePrivateHeaders [ FDirName kernel util ] ;
UsePrivateHeaders [ FDirName shared ] ;
@@ -10,7 +12,7 @@ UsePrivateHeaders [ FDirName storage ] ;
{
local defines =
_BOOT_MODE
BOOT_ARCH=\\\"$(OBOS_ARCH)\\\"
BOOT_ARCH=\\\"$(TARGET_ARCH)\\\"
BOOT_SUPPORT_PARTITION_AMIGA
BOOT_SUPPORT_PARTITION_APPLE
@@ -63,22 +65,22 @@ KernelStaticLibrary boot_partitions :
# Tell Jam where to find the utility sources
SEARCH on [ FGristFiles kernel_cpp.cpp list.c ]
= [ FDirName $(OBOS_TOP) src system kernel util ] ;
= [ FDirName $(HAIKU_TOP) src system kernel util ] ;
SEARCH on [ FGristFiles driver_settings.c ]
= [ FDirName $(OBOS_TOP) src system libroot os ] ;
= [ FDirName $(HAIKU_TOP) src system libroot os ] ;
SEARCH on [ FGristFiles amiga_rdb.cpp ]
= [ FDirName $(OBOS_TOP) src add-ons kernel partitioning_systems amiga ] ;
= [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems amiga ] ;
SEARCH on [ FGristFiles apple.cpp ]
= [ FDirName $(OBOS_TOP) src add-ons kernel partitioning_systems apple ] ;
= [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems apple ] ;
SEARCH on [ FGristFiles intel.cpp PartitionMap.cpp PartitionMapParser.cpp ]
= [ FDirName $(OBOS_TOP) src add-ons kernel partitioning_systems intel ] ;
= [ FDirName $(HAIKU_TOP) src add-ons kernel partitioning_systems intel ] ;
SEARCH on [ FGristFiles stage2_crt0.S ]
= [ FDirName $(OBOS_TOP) src system boot arch $(OBOS_ARCH) ] ;
= [ FDirName $(HAIKU_TOP) src system boot arch $(TARGET_ARCH) ] ;
SubInclude OBOS_TOP src system boot loader file_systems ;
SubInclude HAIKU_TOP src system boot loader file_systems ;
src/system/boot/loader/file_systems/Jamfile
+5 -5
View File
@@ -1,6 +1,6 @@
SubDir OBOS_TOP src system boot loader file_systems ;
SubDir HAIKU_TOP src system boot loader file_systems ;
SubInclude OBOS_TOP src system boot loader file_systems amiga_ffs ;
SubInclude OBOS_TOP src system boot loader file_systems bfs ;
SubInclude OBOS_TOP src system boot loader file_systems hfs_plus ;
SubInclude OBOS_TOP src system boot loader file_systems tarfs ;
SubInclude HAIKU_TOP src system boot loader file_systems amiga_ffs ;
SubInclude HAIKU_TOP src system boot loader file_systems bfs ;
SubInclude HAIKU_TOP src system boot loader file_systems hfs_plus ;
SubInclude HAIKU_TOP src system boot loader file_systems tarfs ;
src/system/boot/loader/file_systems/amiga_ffs/Jamfile
+3 -3
View File
@@ -1,10 +1,10 @@
SubDir OBOS_TOP src system boot loader file_systems amiga_ffs ;
SubDir HAIKU_TOP src system boot loader file_systems amiga_ffs ;
UsePrivateHeaders [ FDirName kernel boot platform $(OBOS_BOOT_PLATFORM) ] ;
UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
UsePrivateHeaders [ FDirName storage ] ;
#SubDirHdrs $(OBOS_TOP) src add-ons kernel file_systems amiga_ffs ;
#SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_systems amiga_ffs ;
SubDirC++Flags -fno-rtti ;
src/system/boot/loader/file_systems/bfs/Jamfile
+3 -3
View File
@@ -1,10 +1,10 @@
SubDir OBOS_TOP src system boot loader file_systems bfs ;
SubDir HAIKU_TOP src system boot loader file_systems bfs ;
UsePrivateHeaders [ FDirName kernel boot platform $(OBOS_BOOT_PLATFORM) ] ;
UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
UsePrivateHeaders [ FDirName storage ] ;
SubDirHdrs $(OBOS_TOP) src add-ons kernel file_systems bfs ;
SubDirHdrs $(HAIKU_TOP) src add-ons kernel file_systems bfs ;
SubDirC++Flags -fno-rtti ;
src/system/boot/loader/file_systems/hfs_plus/Jamfile
+2 -2
View File
@@ -1,6 +1,6 @@
SubDir OBOS_TOP src system boot loader file_systems hfs_plus ;
SubDir HAIKU_TOP src system boot loader file_systems hfs_plus ;
UsePrivateHeaders [ FDirName kernel boot platform $(OBOS_BOOT_PLATFORM) ] ;
UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
UsePrivateHeaders [ FDirName storage ] ;
src/system/boot/loader/file_systems/tarfs/Jamfile
+5 -5
View File
@@ -1,16 +1,16 @@
SubDir OBOS_TOP src system boot loader file_systems tarfs ;
SubDir HAIKU_TOP src system boot loader file_systems tarfs ;
UseHeaders [ FDirName $(OBOS_TOP) headers libs zlib ] ;
UseHeaders [ FDirName $(HAIKU_TOP) headers libs zlib ] ;
UsePrivateHeaders [ FDirName kernel boot platform $(OBOS_BOOT_PLATFORM) ] ;
UsePrivateHeaders [ FDirName kernel boot platform $(TARGET_BOOT_PLATFORM) ] ;
UsePrivateHeaders [ FDirName kernel disk_device_manager ] ;
UsePrivateHeaders shared storage ;
SubDirHdrs $(OBOS_TOP) headers libs zlib ;
SubDirSysHdrs $(HAIKU_TOP) headers libs zlib ;
SubDirC++Flags -fno-rtti ;
#SubDirCcFlags -DGUNZIP=1 ;
SEARCH_SOURCE += [ FDirName $(OBOS_TOP) src libs zlib ] ;
SEARCH_SOURCE += [ FDirName $(HAIKU_TOP) src libs zlib ] ;
KernelStaticLibrary boot_tarfs :
tarfs.cpp