* Fixed PXE boot loader build again (hey mmu_man!).

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@33456 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2009-10-06 09:25:35 +00:00
parent 936c6d6c7d
commit c0f44af061
+12 -5
View File
@@ -17,6 +17,13 @@ UsePrivateHeaders [ FDirName storage ] ;
SubDirC++Flags $(defines) -Wall -Wno-multichar -fno-rtti ; SubDirC++Flags $(defines) -Wall -Wno-multichar -fno-rtti ;
} }
local genericPlatformSources =
text_menu.cpp
video_blit.cpp
video_splash.cpp
video_rle.cpp
;
local bios_ia32_src = local bios_ia32_src =
start.c start.c
debug.c debug.c
@@ -32,6 +39,7 @@ local bios_ia32_src =
smp.cpp smp.cpp
support.S support.S
video.cpp video.cpp
hpet.cpp
apm.cpp apm.cpp
; ;
@@ -50,9 +58,8 @@ KernelMergeObject boot_platform_pxe_ia32.o :
pxe_undi.cpp pxe_undi.cpp
$(bios_ia32_src) $(bios_ia32_src)
$(bios_ia32_edid_src) $(bios_ia32_edid_src)
$(genericPlatformSources)
# generic
text_menu.cpp
: -fno-pic : -fno-pic
; ;
@@ -76,12 +83,12 @@ BuildPXEstage1 pxehaiku : pxe_stage1.S ;
SEARCH on [ FGristFiles $(bios_ia32_src) ] SEARCH on [ FGristFiles $(bios_ia32_src) ]
= [ FDirName $(SUBDIR) $(DOTDOT) bios_ia32 ] ; = [ FDirName $(SUBDIR) $(DOTDOT) bios_ia32 ] ;
SEARCH on [ FGristFiles text_menu.cpp ]
= [ FDirName $(HAIKU_TOP) src system boot platform generic ] ;
SEARCH on [ FGristFiles $(bios_ia32_edid_src) ] SEARCH on [ FGristFiles $(bios_ia32_edid_src) ]
= [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ; = [ FDirName $(HAIKU_TOP) src add-ons accelerants common ] ;
SEARCH on [ FGristFiles $(genericPlatformSources) ]
= [ FDirName $(HAIKU_TOP) src system boot platform generic ] ;
# We also need the bios_ia32 stage1.bin for building bin/makebootable # We also need the bios_ia32 stage1.bin for building bin/makebootable
SEARCH on stage1.bin SEARCH on stage1.bin
= [ FDirName $(SUBDIR) $(DOTDOT) bios_ia32 ] ; = [ FDirName $(SUBDIR) $(DOTDOT) bios_ia32 ] ;