Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

When you now set COMPILE_FOR_ZETA=1 on the command line when jamming, the

Browse Source 
api version will be set to 3 as required for Dano/Zeta - apparently, the
previous mechanism doesn't work with our headers, as we don't define
B_BEOS_VERSION_DANO at all :)
Fixed the build again (because of the stdio switch).


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7428 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2004-05-06 12:30:23 +00:00
parent b6ec0fb23b
commit c697a0f4cc
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/add-ons/kernel/file_systems/bfs/Jamfile
View File

@ -15,6 +15,8 @@ oldOPTIM = $(OPTIM) ;
# under Dano/Zeta
if $(COMPILE_FOR_R5) {
defines += COMPILE_FOR_R5 ;
} else if $(COMPILE_FOR_ZETA) {
defines += COMPILE_FOR_ZETA ;
}
# Enable OpenBFS to be compiled as a full BFS replacement. Will
@ -36,7 +38,7 @@ oldOPTIM = $(OPTIM) ;
SubDirC++Flags $(defines) -Wall -Wno-multichar ;
}
UsePrivateHeaders [ FDirName kernel util ] ; # For kernel_cpp.cpp
UsePrivateHeaders [ FDirName kernel ] ; # For kernel_cpp.cpp
R5KernelAddon $(bfsAddOnName) : [ FDirName kernel file_systems ] :
BlockAllocator.cpp

8
src/add-ons/kernel/file_systems/bfs/fsproto.h
View File

@ -60,10 +60,10 @@ typedef ino_t vnode_id;
#define IOCTL_MODIFIED_TIME 10003
// B_CUR_FS_API_VERSION is 2 for R5, but 3 on Dano, because of the
// added calls for power management - so it's set to 3 here because
// that's a requirement to let Dano boot from our fs...
#if defined(B_BEOS_VERSION_DANO) && !defined(COMPILE_FOR_R5)
// B_CUR_FS_API_VERSION is 2 for R5, but 3 on Zeta and Dano, because
// of the added calls for power management - so it's set to 3 here
// because that's a requirement to let Dano boot from our fs...
#ifdef COMPILE_FOR_ZETA
# define B_CUR_FS_API_VERSION 3
#else
# define B_CUR_FS_API_VERSION 2