* Changed directory structure as suggested on the mailing list.
* Made the TimeZoneView less error prone, and also actually use Haiku code (the previous check didn't work since it used #if, not #ifdef). * Also took the liberty to rename our boot loader to haiku_loader, since I had to update the nasm binary anyway. Updated the assembly sources to nasm 2.0. * I haven't found where the synth location in the MIDI code is specified, though. * Also, NetBootArchive, and FloppyBootImage haven't been updated yet. Will do so next. * Some optional packages still put their license to beos/etc/licenses. I didn't update them yet, as we'll probably do so anyway at some point. Also, I think we might want to introduce a common/data/licenses instead for those. * If you encounter any problems, please tell! git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29876 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -171,21 +171,21 @@ switch $(HAIKU_CPU) {
|
||||
{
|
||||
HAIKU_DEFINES += __POWERPC__ ;
|
||||
HAIKU_BOOT_PLATFORM = openfirmware ;
|
||||
# offset in floppy image (>= sizeof(zbeos))
|
||||
# offset in floppy image (>= sizeof(haiku_loader))
|
||||
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 192 ; # in kB - unused yet
|
||||
}
|
||||
case x86 :
|
||||
{
|
||||
HAIKU_DEFINES += __INTEL__ ;
|
||||
HAIKU_BOOT_PLATFORM = bios_ia32 ;
|
||||
# offset in floppy image (>= sizeof(zbeos))
|
||||
# offset in floppy image (>= sizeof(haiku_loader))
|
||||
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 300 ; # in kB
|
||||
}
|
||||
case m68k :
|
||||
{
|
||||
HAIKU_DEFINES += __M68K__ ;
|
||||
HAIKU_BOOT_PLATFORM = atari_m68k ;
|
||||
# offset in floppy image (>= sizeof(zbeos))
|
||||
# offset in floppy image (>= sizeof(haiku_loader))
|
||||
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 130 ; # in kB
|
||||
}
|
||||
case * :
|
||||
|
||||
Reference in New Issue
Block a user