add_definitions(-D_NTHAL_ -D_BLDR_ -D_NTSYSTEM_)
-if((ARCH STREQUAL "arm") AND (SARCH STREQUAL "omap-zoom2"))
- add_definitions(-D_ZOOM2_)
-endif()
-
list(APPEND FREELDR_COMMON_SOURCE
+ include/freeldr.h
+ arcname.c
cmdline.c
+ custom.c
debug.c
linuxboot.c
+ miscboot.c
machine.c
options.c
oslist.c
version.c
- arcemul/time.c
+ arch/archwsup.c
cache/blocklist.c
cache/cache.c
comm/rs232.c
fs/fs.c
fs/iso.c
fs/ntfs.c
- fs/pxe.c
- inifile/ini_init.c
- inifile/inifile.c
- inifile/parse.c
+ lib/inifile/ini_init.c
+ lib/inifile/inifile.c
+ lib/inifile/parse.c
mm/meminit.c
mm/mm.c
mm/heap.c
- reactos/registry.c
- reactos/arcname.c
- reactos/archwsup.c
- reactos/binhive.c
ui/directui.c
ui/gui.c
ui/minitui.c
video/video.c
windows/conversion.c
windows/peloader.c
+ windows/registry.c
windows/winldr.c
windows/wlmemory.c
windows/wlregistry.c)
arch/i386/linux.S
arch/i386/mb.S)
list(APPEND FREELDR_COMMON_SOURCE
+ fs/pxe.c
arch/i386/archmach.c
- arch/i386/custom.c
arch/i386/drivemap.c
arch/i386/halstub.c
arch/i386/hardware.c
arch/i386/i386rtl.c
arch/i386/i386vid.c
arch/i386/machpc.c
- arch/i386/miscboot.c
arch/i386/ntoskrnl.c
arch/i386/pccons.c
arch/i386/pcdisk.c
windows/headless.c
disk/scsiport.c)
if(NOT MSVC)
- list(APPEND FREELDR_COMMON_SOURCE arch/i386/drvmap.S)
+ list(APPEND FREELDR_COMMON_ASM_SOURCE arch/i386/drvmap.S)
endif()
elseif(ARCH STREQUAL "amd64")
list(APPEND FREELDR_COMMON_ASM_SOURCE
arch/amd64/int386.S
arch/amd64/pnpbios.S)
list(APPEND FREELDR_COMMON_SOURCE
+ fs/pxe.c
+ arch/i386/drivemap.c
arch/i386/hardware.c
arch/i386/hwacpi.c
arch/i386/hwapm.c
arch/i386/pcrtc.c
arch/i386/pcvideo.c
arch/amd64/winldr.c)
+elseif(ARCH STREQUAL "arm")
+ list(APPEND FREELDR_COMMON_ASM_SOURCE
+ arch/arm/boot.S)
+ list(APPEND FREELDR_COMMON_SOURCE
+ arch/arm/macharm.c
+ arch/arm/winldr.c)
else()
#TBD
endif()
-if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7))
- add_library(freeldr_common OBJECT ${FREELDR_COMMON_SOURCE} ${FREELDR_COMMON_ASM_SOURCE})
-else()
- add_asm_files(freeldr_common_asm ${FREELDR_COMMON_ASM_SOURCE})
- add_library(freeldr_common ${FREELDR_COMMON_SOURCE} ${freeldr_common_asm})
-endif()
-add_dependencies(freeldr_common bugcodes)
+add_asm_files(freeldr_common_asm ${FREELDR_COMMON_ASM_SOURCE})
+add_library(freeldr_common ${FREELDR_COMMON_SOURCE} ${freeldr_common_asm})
+add_pch(freeldr_common include/freeldr.h FREELDR_COMMON_SOURCE)
+add_dependencies(freeldr_common bugcodes xdk)
if(ARCH STREQUAL "i386" AND NOT MSVC)
list(APPEND FREELDR_BASE_SOURCE arch/i386/multiboot.S)
+ target_link_libraries(freeldr_common mini_hal)
endif()
list(APPEND FREELDR_BASE_SOURCE
bootmgr.c # This file is compiled with custom definitions
freeldr.c
- rtl/libsupp.c)
+ windows/setupldr.c
+ lib/inffile/inffile.c
+ lib/rtl/libsupp.c)
if(NOT MSVC)
list(APPEND FREELDR_BASE_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.def)
endif()
-if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7))
- add_library(freeldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE})
- add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE})
- if(SEPARATE_DBG)
- set_target_properties(freeldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER)
- set_target_properties(freeldr_pe_dbg PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER)
- endif()
-else()
- add_library(freeldr_pe SHARED ${FREELDR_BASE_SOURCE})
- add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE})
+add_library(freeldr_pe SHARED ${FREELDR_BASE_SOURCE})
+add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE})
+
+if(NOT MSVC AND SEPARATE_DBG)
+ set_target_properties(freeldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER)
+ set_target_properties(freeldr_pe_dbg PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER)
endif()
-if(NOT MSVC)
+if(MSVC)
+ if(ARCH STREQUAL "arm")
+ add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER")
+ add_target_link_flags(freeldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER")
+ else()
+ add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text ")
+ add_target_link_flags(freeldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text")
+ endif()
+else()
add_target_link_flags(freeldr_pe "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lds")
add_target_link_flags(freeldr_pe_dbg "-Wl,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lds")
-else()
- add_target_link_flags(freeldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text ")
- add_target_link_flags(freeldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text")
endif()
set_image_base(freeldr_pe 0x10000)
target_link_libraries(freeldr_pe_dbg mini_hal)
endif()
-if(MSVC OR (NOT CMAKE_VERSION VERSION_GREATER 2.8.7))
- target_link_libraries(freeldr_pe freeldr_common)
- target_link_libraries(freeldr_pe_dbg freeldr_common)
-endif()
-
-target_link_libraries(freeldr_pe cportlib rossym cmlib rtl libcntpr)
-target_link_libraries(freeldr_pe_dbg cportlib rossym cmlib rtl libcntpr)
+target_link_libraries(freeldr_pe freeldr_common cportlib cmlib rtl libcntpr)
+target_link_libraries(freeldr_pe_dbg freeldr_common cportlib cmlib rtl libcntpr)
-# add_pch(freeldr_pe include/freeldr.h)
+if(STACK_PROTECTOR)
+ target_link_libraries(freeldr_pe gcc_ssp)
+ target_link_libraries(freeldr_pe_dbg gcc_ssp)
+elseif(RUNTIME_CHECKS)
+ target_link_libraries(freeldr_pe runtmchk)
+ target_link_libraries(freeldr_pe_dbg runtmchk)
+ add_target_link_flags(freeldr_pe "/MERGE:.rtc=.text")
+endif()
add_dependencies(freeldr_pe asm)
add_dependencies(freeldr_pe_dbg asm)
-concatenate_files(
- ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin
- freeldr_pe
- ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys)
-
-add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys)
+# Retrieve the full path to the generated file of the 'freeldr_pe' target
+get_target_property(_freeldr_pe_output_file freeldr_pe LOCATION)
-# rename freeldr on livecd to setupldr.sys because isoboot.bin looks for setupldr.sys
-add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB FOR bootcd regtest)
-add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB FOR livecd NAME_ON_CD setupldr.sys)
+if(NOT ARCH STREQUAL "arm")
-list(APPEND SETUPLDR_SOURCE
- inffile/inffile.c)
-
-if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64")
- list(APPEND SETUPLDR_SOURCE windows/setupldr.c)
-endif()
-
-if((NOT MSVC) AND (CMAKE_VERSION VERSION_GREATER 2.8.7))
- add_library(setupldr_pe SHARED $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
- add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL $<TARGET_OBJECTS:freeldr_common> ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
- if(SEPARATE_DBG)
- set_target_properties(setupldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER)
- set_target_properties(setupldr_pe_dbg PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER)
- endif()
-else()
- add_library(setupldr_pe SHARED ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
- add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
-endif()
+ concatenate_files(
+ ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys
+ ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin
+ ${_freeldr_pe_output_file})
-if(NOT MSVC)
- add_target_link_flags(setupldr_pe "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lds")
- add_target_link_flags(setupldr_pe_dbg "-Wl,--exclude-all-symbols,--file-alignment,0x1000,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr_i386.lds")
+ add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys)
else()
- add_target_link_flags(setupldr_pe "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text")
- add_target_link_flags(setupldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text")
+ add_custom_target(freeldr ALL DEPENDS ${_freeldr_pe_output_file})
endif()
-add_target_compile_definitions(setupldr_pe FREELDR_REACTOS_SETUP)
-add_target_compile_definitions(setupldr_pe_dbg FREELDR_REACTOS_SETUP)
-
-set_image_base(setupldr_pe 0x10000)
-set_subsystem(setupldr_pe native)
-set_entrypoint(setupldr_pe RealEntryPoint)
+# rename freeldr on livecd to setupldr.sys because isoboot.bin looks for setupldr.sys
+add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB FOR bootcd regtest)
+add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB NOT_IN_HYBRIDCD FOR livecd hybridcd NAME_ON_CD setupldr.sys)
-set_image_base(setupldr_pe_dbg 0x10000)
-set_subsystem(setupldr_pe_dbg native)
-set_entrypoint(setupldr_pe_dbg RealEntryPoint)
+if(NOT ARCH STREQUAL "arm")
-if(ARCH STREQUAL "i386")
- target_link_libraries(setupldr_pe mini_hal)
- target_link_libraries(setupldr_pe_dbg mini_hal)
-endif()
+ concatenate_files(
+ ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys
+ ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin
+ ${_freeldr_pe_output_file})
-if(MSVC OR (NOT CMAKE_VERSION VERSION_GREATER 2.8.7))
- target_link_libraries(setupldr_pe freeldr_common)
- target_link_libraries(setupldr_pe_dbg freeldr_common)
+ add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys)
+else()
+ add_custom_target(setupldr ALL DEPENDS ${_freeldr_pe_output_file})
endif()
-target_link_libraries(setupldr_pe cportlib rossym cmlib rtl libcntpr)
-target_link_libraries(setupldr_pe_dbg cportlib rossym cmlib rtl libcntpr)
-
-add_dependencies(setupldr_pe asm)
-add_dependencies(setupldr_pe_dbg asm)
-
-concatenate_files(
- ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin
- setupldr_pe
- ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys)
-
-add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys)
add_cd_file(TARGET setupldr FILE ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys DESTINATION loader NO_CAB FOR bootcd regtest)
+
projects / reactos.git / blobdiff