[haiku-commits] r39165 - haiku/trunk/build/jam
- From: revol@xxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 27 Oct 2010 17:51:55 +0200 (CEST)
Author: mmu_man
Date: 2010-10-27 17:51:54 +0200 (Wed, 27 Oct 2010)
New Revision: 39165
Changeset: http://dev.haiku-os.org/changeset/39165
Modified:
haiku/trunk/build/jam/BuildSetup
Log:
M68K: Do not force HAIKU_BOOT_PLATFORM and make the floppy image size depend on
it. One should use HAIKU_BOOT_PLATFORM={atari_m68k|amiga_m68k} now instead of
setting TARGET_BOOT_PLATFORM.
Note we aren't yet at the point where jam can make you a floppy image due to
broken vm stuff.
It might be interesting to also switch the extension used on the image, amiga
emulators prefer .adf for ex.
Modified: haiku/trunk/build/jam/BuildSetup
===================================================================
--- haiku/trunk/build/jam/BuildSetup 2010-10-27 15:47:37 UTC (rev 39164)
+++ haiku/trunk/build/jam/BuildSetup 2010-10-27 15:51:54 UTC (rev 39165)
@@ -266,8 +266,18 @@
case m68k :
{
HAIKU_DEFINES += __M68K__ ;
- HAIKU_BOOT_PLATFORM = atari_m68k ;
- HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ; # in kB
+ HAIKU_BOOT_PLATFORM ?= atari_m68k ;
+ switch $(HAIKU_BOOT_PLATFORM) {
+ case atari_m68k :
+ {
+ HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 1440 ; # in kB
+ }
+ case amiga_m68k :
+ {
+ # for now we have trouble reading from
double-sided images
+ HAIKU_BOOT_FLOPPY_IMAGE_SIZE = 880 ; # in kB
+ }
+ }
# offset in floppy image (>= sizeof(haiku_loader))
HAIKU_BOOT_ARCHIVE_IMAGE_OFFSET = 150 ; # in kB
HAIKU_NO_WERROR = 1 ;
Other related posts:
- » [haiku-commits] r39165 - haiku/trunk/build/jam - revol
