From c0f44af0614a64e4b895d02553f26ad36d259044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 6 Oct 2009 09:25:35 +0000 Subject: [PATCH] * 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 --- src/system/boot/platform/pxe_ia32/Jamfile | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/system/boot/platform/pxe_ia32/Jamfile b/src/system/boot/platform/pxe_ia32/Jamfile index 397d03bf31..22f87ecc96 100644 --- a/src/system/boot/platform/pxe_ia32/Jamfile +++ b/src/system/boot/platform/pxe_ia32/Jamfile @@ -17,6 +17,13 @@ UsePrivateHeaders [ FDirName storage ] ; 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 = start.c debug.c @@ -32,6 +39,7 @@ local bios_ia32_src = smp.cpp support.S video.cpp + hpet.cpp apm.cpp ; @@ -50,9 +58,8 @@ KernelMergeObject boot_platform_pxe_ia32.o : pxe_undi.cpp $(bios_ia32_src) $(bios_ia32_edid_src) + $(genericPlatformSources) - # generic - text_menu.cpp : -fno-pic ; @@ -76,12 +83,12 @@ BuildPXEstage1 pxehaiku : pxe_stage1.S ; SEARCH on [ FGristFiles $(bios_ia32_src) ] = [ 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) ] = [ 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 SEARCH on stage1.bin = [ FDirName $(SUBDIR) $(DOTDOT) bios_ia32 ] ;