Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 04:33:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

[FREELDR]

Browse source 
Cleanup the CMakeLists.txt file. Create one shared library containing most files and only compile a few files for both freeldr and setupldr, which reduces build time.
There is only one file, that takes different compile time definitions, but since LD is stupid and cannot bidirectionally link between seperate libraries, we have to add 3 more files to each build.

svn path=/trunk/; revision=52338
This commit is contained in:
Timo Kreuzer 2011-06-18 14:37:54 +00:00
parent 0b46759664
commit 2a2e52bbe8
1 changed files with 72 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

160
reactos/boot/freeldr/freeldr/CMakeLists.txt
View file

@ -1,6 +1,25 @@
if(ARCH MATCHES i386)
if (NOT MSVC)
CreateBootSectorTarget2(frldr16
${CMAKE_CURRENT_SOURCE_DIR}/arch/realmode/i386.S
${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin
8000)
else()
CreateBootSectorTarget2(frldr16
${CMAKE_CURRENT_SOURCE_DIR}/arch/realmode/i386.S
${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin
F000)
endif()
endif()
include_directories(BEFORE include) include_directories(BEFORE include)
include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
include_directories(${REACTOS_SOURCE_DIR}/lib/cmlib)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/elf)
add_definitions(-D_NTHAL_ -D_BLDR_ -D_NTSYSTEM_)
if(ARCH MATCHES arm) if(ARCH MATCHES arm)
if(SARCH MATCHES omap-zoom2) if(SARCH MATCHES omap-zoom2)
@ -8,40 +27,14 @@ if(ARCH MATCHES arm)
endif() endif()
endif() endif()
if(ARCH MATCHES i386) list(APPEND FREELDR_COMMON_SOURCE
list(APPEND FREELDR_BASE64K_SOURCE cmdline.c
arch/i386/entry.S debug.c
arch/i386/i386idt.c linuxboot.c
arch/i386/i386trap.S machine.c
arch/i386/i386pnp.cmake.S options.c
arch/i386/i386bug.c oslist.c
arch/i386/linux.cmake.S version.c
arch/i386/mb.S)
if(NOT MSVC)
list(APPEND FREELDR_BASE64K_SOURCE
arch/i386/drvmap.S
arch/i386/multiboot.S)
else()
list(APPEND FREELDR_BASE64K_SOURCE
arch/i386/realmode.S)
endif()
elseif(ARCH MATCHES amd64)
if(NOT MSVC)
list(APPEND FREELDR_BASE64K_SOURCE
arch/i386/drvmap.S
arch/i386/i386trap.S
arch/amd64/mb.S)
else()
list(APPEND FREELDR_BASE64K_SOURCE
arch/amd64/stubs.S)
endif()
endif()
set_source_files_properties(${FREELDR_BASE64K_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_")
include_directories(${REACTOS_SOURCE_DIR}/lib/cmlib)
list(APPEND FREELDR_BASE_SOURCE
arcemul/mm.c arcemul/mm.c
arcemul/time.c arcemul/time.c
cache/blocklist.c cache/blocklist.c
@ -68,8 +61,6 @@ list(APPEND FREELDR_BASE_SOURCE
reactos/binhive.c reactos/binhive.c
reactos/reactos.c reactos/reactos.c
reactos/imageldr.c reactos/imageldr.c
rtl/bget.c
rtl/libsupp.c
ui/directui.c ui/directui.c
ui/gui.c ui/gui.c
ui/minitui.c ui/minitui.c
@ -85,41 +76,30 @@ list(APPEND FREELDR_BASE_SOURCE
windows/winldr.c windows/winldr.c
windows/wlmemory.c windows/wlmemory.c
windows/wlregistry.c windows/wlregistry.c
freeldr.c )
debug.c
version.c
cmdline.c
machine.c
options.c
linuxboot.c
oslist.c)
if(ARCH MATCHES i386) if(ARCH MATCHES i386)
list(APPEND FREELDR_BASE_SOURCE list(APPEND FREELDR_COMMON_SOURCE
windows/headless.c
disk/scsiport.c)
endif()
set_source_files_properties(${FREELDR_BASE_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_;_BLDR_;_NTSYSTEM_")
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/libs)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/elf)
if(ARCH MATCHES i386)
list(APPEND FREELDR_ARCH_SOURCE
arch/i386/archmach.c arch/i386/archmach.c
arch/i386/custom.c arch/i386/custom.c
arch/i386/drivemap.c arch/i386/drivemap.c
arch/i386/entry.S
arch/i386/halstub.c arch/i386/halstub.c
arch/i386/hardware.c arch/i386/hardware.c
arch/i386/hwacpi.c arch/i386/hwacpi.c
arch/i386/hwapm.c arch/i386/hwapm.c
arch/i386/hwpci.c arch/i386/hwpci.c
arch/i386/i386bug.c
arch/i386/i386disk.c arch/i386/i386disk.c
arch/i386/i386idt.c
arch/i386/i386pnp.cmake.S
arch/i386/i386rtl.c arch/i386/i386rtl.c
arch/i386/i386trap.S
arch/i386/i386vid.c arch/i386/i386vid.c
arch/i386/linux.cmake.S
arch/i386/loader.c arch/i386/loader.c
arch/i386/machpc.c arch/i386/machpc.c
arch/i386/mb.S
arch/i386/miscboot.c arch/i386/miscboot.c
arch/i386/ntoskrnl.c arch/i386/ntoskrnl.c
arch/i386/pccons.c arch/i386/pccons.c
@ -137,9 +117,19 @@ if(ARCH MATCHES i386)
arch/i386/xboxrtc.c arch/i386/xboxrtc.c
arch/i386/xboxvideo.c arch/i386/xboxvideo.c
windows/i386/ntsetup.c windows/i386/ntsetup.c
windows/i386/wlmemory.c) windows/i386/wlmemory.c
windows/headless.c
disk/scsiport.c)
if(NOT MSVC)
list(APPEND FREELDR_COMMON_SOURCE
arch/i386/drvmap.S
arch/i386/multiboot.S)
else()
list(APPEND FREELDR_COMMON_SOURCE
arch/i386/realmode.S)
endif()
elseif(ARCH MATCHES amd64) elseif(ARCH MATCHES amd64)
list(APPEND FREELDR_ARCH_SOURCE list(APPEND FREELDR_COMMON_SOURCE
arch/amd64/loader.c arch/amd64/loader.c
arch/i386/hardware.c arch/i386/hardware.c
arch/i386/hwacpi.c arch/i386/hwacpi.c
@ -157,33 +147,31 @@ elseif(ARCH MATCHES amd64)
arch/i386/pcvideo.c arch/i386/pcvideo.c
windows/amd64/ntsetup.c windows/amd64/ntsetup.c
windows/amd64/wlmemory.c) windows/amd64/wlmemory.c)
if(NOT MSVC)
list(APPEND FREELDR_COMMON_SOURCE
arch/i386/drvmap.S
arch/i386/i386trap.S
arch/amd64/mb.S)
else()
list(APPEND FREELDR_COMMON_SOURCE
arch/amd64/stubs.S)
endif()
else() else()
#TBD #TBD
endif() endif()
set_source_files_properties(${FREELDR_ARCH_SOURCE} PROPERTIES COMPILE_DEFINITIONS "_NTHAL_;_BLDR_;_NTSYSTEM_") add_library(freeldr_common ${FREELDR_COMMON_SOURCE})
add_library(freeldr_arch ${FREELDR_ARCH_SOURCE}) add_dependencies(freeldr_common bugcodes)
add_dependencies(freeldr_arch bugcodes)
if (NOT MSVC)
CreateBootSectorTarget2(frldr16
${CMAKE_CURRENT_SOURCE_DIR}/arch/realmode/i386.S
${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin
8000)
else()
CreateBootSectorTarget2(frldr16
${CMAKE_CURRENT_SOURCE_DIR}/arch/realmode/i386.S
${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin
F000)
endif()
list(APPEND FREELDR_SOURCE list(APPEND FREELDR_BASE_SOURCE
bootmgr.c bootmgr.c # This file is compiled with custom definitions
${FREELDR_BASE64K_SOURCE} freeldr.c
${FREELDR_BASE_SOURCE} rtl/bget.c
rtl/libsupp.c
) )
add_executable(freeldr_pe ${FREELDR_SOURCE}) add_executable(freeldr_pe ${FREELDR_BASE_SOURCE})
if(NOT MSVC) if(NOT MSVC)
set_target_properties(freeldr_pe PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk") set_target_properties(freeldr_pe PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk")
@ -201,7 +189,7 @@ if(ARCH MATCHES i386)
endif() endif()
target_link_libraries(freeldr_pe target_link_libraries(freeldr_pe
freeldr_arch freeldr_common
cportlib cportlib
rossym rossym
cmlib cmlib
@ -220,25 +208,19 @@ add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys)
add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB FOR all) add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB FOR all)
list(APPEND SETUPLDR_MAIN_SOURCE list(APPEND SETUPLDR_SOURCE
bootmgr.c
inffile/inffile.c inffile/inffile.c
reactos/setupldr.c) reactos/setupldr.c)
if(ARCH MATCHES i386 OR ARCH MATCHES amd64) if(ARCH MATCHES i386 OR ARCH MATCHES amd64)
list(APPEND SETUPLDR_MAIN_SOURCE windows/setupldr2.c) list(APPEND SETUPLDR_SOURCE windows/setupldr2.c)
endif() endif()
if(NOT MSVC) if(NOT MSVC)
set_source_files_properties(${SETUPLDR_MAIN_SOURCE} PROPERTIES COMPILE_FLAGS "-ffreestanding -fno-builtin -fno-inline -fno-zero-initialized-in-bss") set_source_files_properties(${SETUPLDR_SOURCE} PROPERTIES COMPILE_FLAGS "-ffreestanding -fno-builtin -fno-inline -fno-zero-initialized-in-bss")
endif() endif()
list(APPEND SETUPLDR_SOURCE add_executable(setupldr_pe ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
${FREELDR_BASE64K_SOURCE}
${FREELDR_BASE_SOURCE}
${SETUPLDR_MAIN_SOURCE})
add_executable(setupldr_pe ${SETUPLDR_SOURCE})
if(NOT MSVC) if(NOT MSVC)
set_target_properties(setupldr_pe PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP") set_target_properties(setupldr_pe PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lnk" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP")
@ -256,7 +238,7 @@ if(ARCH MATCHES i386)
endif() endif()
target_link_libraries(setupldr_pe target_link_libraries(setupldr_pe
freeldr_arch freeldr_common
cportlib cportlib
rossym rossym
cmlib cmlib