if(SEPARATE_DBG)
# FIXME: http://sourceware.org/bugzilla/show_bug.cgi?id=11822
- set(CMAKE_LDR_PE_HELPER_CREATE_SHARED_LIBRARY "<CMAKE_C_COMPILER> <CMAKE_SHARED_LIBRARY_C_FLAGS> <LINK_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_C_FLAGS> -o <TARGET> <OBJECTS> <LINK_LIBRARIES>")
+ set(CMAKE_LDR_PE_HELPER_LINK_EXECUTABLE "<CMAKE_C_COMPILER> <CMAKE_C_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
set(CMAKE_LDR_PE_HELPER_STANDARD_LIBRARIES "-lgcc" CACHE STRING "Standard C Libraries")
endif()
-spec2def(freeldr.sys freeldr.spec)
+if(MSVC)
+ # We don't need hotpatching
+ replace_compile_flags("/hotpatch" " ")
+
+ # Explicitly use string pooling
+ add_compile_flags("/GF")
+endif()
+
+spec2def(freeldr_pe.exe freeldr.spec)
if(ARCH STREQUAL "i386")
CreateBootSectorTarget(frldr16
include_directories(BEFORE 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)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/lib/cmlib)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/libs)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/elf)
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_BOOTLIB_SOURCE
+ lib/debug.c
+ lib/peloader.c
+ lib/comm/rs232.c
+ ## add KD support
+ lib/fs/btrfs.c
+ lib/fs/ext2.c
+ lib/fs/fat.c
+ lib/fs/fs.c
+ lib/fs/iso.c
+ lib/fs/ntfs.c
+ lib/inifile/ini_init.c
+ lib/inifile/inifile.c
+ lib/inifile/parse.c
+ lib/mm/meminit.c
+ lib/mm/mm.c
+ lib/mm/heap.c)
+
+list(APPEND FREELDR_NTLDR_SOURCE
+ ntldr/conversion.c
+ ntldr/registry.c
+ ntldr/winldr.c
+ ntldr/wlmemory.c
+ ntldr/wlregistry.c)
+
+list(APPEND FREELDR_ARC_SOURCE
+ arcname.c
+ machine.c
+ arch/archwsup.c
+ cache/blocklist.c
+ cache/cache.c
+ disk/disk.c
+ disk/partition.c
+ disk/ramdisk.c)
+ #disk/scsiport.c
-list(APPEND FREELDR_COMMON_SOURCE
+list(APPEND FREELDR_BOOTMGR_SOURCE
include/freeldr.h
cmdline.c
- debug.c
+ custom.c
linuxboot.c
- machine.c
+ miscboot.c
options.c
oslist.c
version.c
- arcemul/time.c
- cache/blocklist.c
- cache/cache.c
- comm/rs232.c
- disk/disk.c
- disk/partition.c
- disk/ramdisk.c
- #disk/scsiport.c
- fs/ext2.c
- fs/fat.c
- fs/fs.c
- fs/iso.c
- fs/ntfs.c
- inifile/ini_init.c
- inifile/inifile.c
- inifile/parse.c
- mm/meminit.c
- mm/mm.c
- mm/heap.c
- reactos/registry.c
- reactos/arcname.c
- reactos/archwsup.c
ui/directui.c
ui/gui.c
ui/minitui.c
ui/ui.c
video/fade.c
video/palette.c
- video/video.c
- windows/conversion.c
- windows/peloader.c
- windows/winldr.c
- windows/wlmemory.c
- windows/wlregistry.c)
+ video/video.c)
+
+list(APPEND FREELDR_BASE_ASM_SOURCE)
if(ARCH STREQUAL "i386")
+ list(APPEND FREELDR_BASE_ASM_SOURCE
+ arch/i386/multiboot.S)
+
list(APPEND FREELDR_COMMON_ASM_SOURCE
+ arch/i386/drvmap.S
arch/i386/entry.S
- arch/i386/i386pnp.S
+ arch/i386/int386.S
+ arch/i386/pnpbios.S
arch/i386/i386trap.S
- arch/i386/linux.S
- arch/i386/mb.S)
- list(APPEND FREELDR_COMMON_SOURCE
- fs/pxe.c
+ arch/i386/linux.S)
+
+ list(APPEND FREELDR_NTLDR_SOURCE
+ ntldr/arch/i386/winldr.c
+ ntldr/headless.c)
+
+ list(APPEND FREELDR_ARC_SOURCE
+ lib/fs/pxe.c
+ arch/i386/halstub.c
+ arch/i386/ntoskrnl.c
arch/i386/archmach.c
- arch/i386/custom.c
arch/i386/drivemap.c
- arch/i386/halstub.c
arch/i386/hardware.c
arch/i386/hwacpi.c
arch/i386/hwapm.c
arch/i386/hwdisk.c
arch/i386/hwpci.c
arch/i386/i386bug.c
- arch/i386/i386disk.c
arch/i386/i386idt.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
arch/i386/pcmem.c
arch/i386/xboxcons.c
arch/i386/xboxdisk.c
arch/i386/xboxfont.c
- arch/i386/xboxhw.c
arch/i386/xboxi2c.c
arch/i386/xboxmem.c
arch/i386/xboxrtc.c
arch/i386/xboxvideo.c
- arch/i386/winldr.c
- windows/headless.c
disk/scsiport.c)
- if(NOT MSVC)
- list(APPEND FREELDR_COMMON_ASM_SOURCE arch/i386/drvmap.S)
- endif()
+
elseif(ARCH STREQUAL "amd64")
list(APPEND FREELDR_COMMON_ASM_SOURCE
arch/amd64/entry.S
arch/amd64/int386.S
arch/amd64/pnpbios.S)
- list(APPEND FREELDR_COMMON_SOURCE
- fs/pxe.c
- arch/i386/custom.c
+
+ list(APPEND FREELDR_NTLDR_SOURCE
+ ntldr/arch/amd64/winldr.c)
+
+ list(APPEND FREELDR_ARC_SOURCE
+ lib/fs/pxe.c
+ arch/i386/ntoskrnl.c
arch/i386/drivemap.c
arch/i386/hardware.c
arch/i386/hwacpi.c
arch/i386/hwpci.c
arch/i386/i386bug.c
arch/i386/i386rtl.c
- arch/i386/i386disk.c
arch/i386/i386vid.c
arch/i386/machpc.c
- arch/i386/ntoskrnl.c
arch/i386/pccons.c
arch/i386/pcdisk.c
arch/i386/pcmem.c
arch/i386/pcrtc.c
- arch/i386/pcvideo.c
- arch/amd64/winldr.c)
+ arch/i386/pcvideo.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)
+
+ list(APPEND FREELDR_NTLDR_SOURCE
+ ntldr/arch/arm/winldr.c)
+
+ list(APPEND FREELDR_ARC_SOURCE
+ arch/arm/entry.c
+ arch/arm/macharm.c)
else()
#TBD
endif()
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)
+add_library(freeldr_common
+ ${freeldr_common_asm}
+ ${FREELDR_BOOTLIB_SOURCE}
+ ${FREELDR_ARC_SOURCE}
+ ${FREELDR_NTLDR_SOURCE}
+ ${FREELDR_BOOTMGR_SOURCE})
+
+if(USE_CLANG_CL)
+ # We need to reduce the binary size
+ add_target_compile_flags(freeldr_common "/Os")
+endif()
+
+set(PCH_SOURCE
+ ${FREELDR_BOOTLIB_SOURCE}
+ ${FREELDR_ARC_SOURCE}
+ ${FREELDR_NTLDR_SOURCE}
+ ${FREELDR_BOOTMGR_SOURCE})
+
+add_pch(freeldr_common include/freeldr.h PCH_SOURCE)
+add_dependencies(freeldr_common bugcodes asm xdk)
+
+## GCC builds need this extra thing for some reason...
if(ARCH STREQUAL "i386" AND NOT MSVC)
- list(APPEND FREELDR_BASE_SOURCE arch/i386/multiboot.S)
+ target_link_libraries(freeldr_common mini_hal)
endif()
+add_asm_files(freeldr_base_asm ${FREELDR_BASE_ASM_SOURCE})
+
list(APPEND FREELDR_BASE_SOURCE
+ ${freeldr_base_asm}
bootmgr.c # This file is compiled with custom definitions
freeldr.c
- rtl/libsupp.c)
+ ntldr/setupldr.c ## Strangely enough this file is needed in GCC builds
+ ## even if ${FREELDR_NTLDR_SOURCE} is not added,
+ ## otherwise we get linking errors with Rtl**Bitmap** APIs.
+ ## Do not happen on MSVC builds however...
+ lib/inffile/inffile.c
+ lib/rtl/libsupp.c)
-if(NOT MSVC)
- list(APPEND FREELDR_BASE_SOURCE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.def)
+if(ARCH STREQUAL "i386")
+ # Must be included together with disk/scsiport.c
+ list(APPEND FREELDR_BASE_SOURCE
+ ${CMAKE_CURRENT_BINARY_DIR}/freeldr_pe.def)
endif()
-add_library(freeldr_pe SHARED ${FREELDR_BASE_SOURCE})
-add_library(freeldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE})
+add_executable(freeldr_pe ${FREELDR_BASE_SOURCE})
+add_executable(freeldr_pe_dbg EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE})
+
+set_property(TARGET freeldr_pe PROPERTY ENABLE_EXPORTS TRUE)
+set_property(TARGET freeldr_pe_dbg PROPERTY ENABLE_EXPORTS TRUE)
if(NOT MSVC AND SEPARATE_DBG)
set_target_properties(freeldr_pe PROPERTIES LINKER_LANGUAGE LDR_PE_HELPER)
endif()
if(MSVC)
- 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")
+ 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 /FILEALIGN:0x200 /ALIGN:0x200")
+ add_linker_script(freeldr_pe freeldr_i386.msvc.lds)
+ add_target_link_flags(freeldr_pe_dbg "/ignore:4078 /ignore:4254 /DRIVER /FIXED /FILEALIGN:0x200 /ALIGN:0x200")
+ add_linker_script(freeldr_pe_dbg freeldr_i386.msvc.lds)
+ 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")
+ add_target_link_flags(freeldr_pe "-Wl,--strip-all,--exclude-all-symbols,--file-alignment,0x200,--section-alignment,0x200")
+ add_linker_script(freeldr_pe freeldr_i386.lds)
+ add_target_link_flags(freeldr_pe_dbg "-Wl,--exclude-all-symbols,--file-alignment,0x200,--section-alignment,0x200")
+ add_linker_script(freeldr_pe_dbg freeldr_i386.lds)
endif()
set_image_base(freeldr_pe 0x10000)
target_link_libraries(freeldr_pe freeldr_common cportlib cmlib rtl libcntpr)
target_link_libraries(freeldr_pe_dbg freeldr_common cportlib cmlib rtl libcntpr)
-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)
-
-# 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)
-
-list(APPEND SETUPLDR_SOURCE
- inffile/inffile.c)
-
-if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64")
- list(APPEND SETUPLDR_SOURCE windows/setupldr.c)
+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_library(setupldr_pe SHARED ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
-add_library(setupldr_pe_dbg SHARED EXCLUDE_FROM_ALL ${FREELDR_BASE_SOURCE} ${SETUPLDR_SOURCE})
-
-if(NOT MSVC AND 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()
+add_dependencies(freeldr_pe asm)
+add_dependencies(freeldr_pe_dbg asm)
-if(MSVC)
- 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")
+if(NOT ARCH STREQUAL "arm")
+ concatenate_files(
+ ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys
+ ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin
+ ${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_FILE_NAME:freeldr_pe>)
+ add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys)
else()
- 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 freeldr_pe)
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)
-
-set_image_base(setupldr_pe_dbg 0x10000)
-set_subsystem(setupldr_pe_dbg native)
-set_entrypoint(setupldr_pe_dbg 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)
-if(ARCH STREQUAL "i386")
- target_link_libraries(setupldr_pe mini_hal)
- target_link_libraries(setupldr_pe_dbg mini_hal)
+if(NOT ARCH STREQUAL "arm")
+ concatenate_files(
+ ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys
+ ${CMAKE_CURRENT_BINARY_DIR}/frldr16.bin
+ ${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_FILE_NAME:freeldr_pe>)
+ add_custom_target(setupldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/setupldr.sys)
+else()
+ add_custom_target(setupldr ALL DEPENDS freeldr_pe)
endif()
-target_link_libraries(setupldr_pe freeldr_common cportlib cmlib rtl libcntpr)
-target_link_libraries(setupldr_pe_dbg freeldr_common cportlib 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