include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
if(ARCH MATCHES i386)
+if(MSVC)
+list(APPEND FREELDR_BASE64K_SOURCE
+ freeldr/freeldr/arch/i386/realmode.S)
+else()
list(APPEND FREELDR_STARTUP_SOURCE
freeldr/freeldr/arch/i386/fathelp.S
freeldr/freeldr/arch/i386/arch.S)
+endif()
elseif(ARCH MATCHES amd64)
list(APPEND FREELDR_STARTUP_SOURCE
- freeldr/freeldr/arch/amd64/fathelp.S
+ freeldr/freeldr/arch/i386/fathelp.S
freeldr/freeldr/arch/amd64/arch.S)
endif(ARCH MATCHES i386)
if(ARCH MATCHES i386)
+if(NOT MSVC)
list(APPEND FREELDR_BASE64K_SOURCE
freeldr/freeldr/arch/i386/boot.S
freeldr/freeldr/arch/i386/drvmap.S
freeldr/freeldr/arch/i386/i386trap.S
freeldr/freeldr/arch/i386/int386.S
freeldr/freeldr/arch/i386/linux.S
- freeldr/freeldr/arch/i386/mb.S)
+ freeldr/freeldr/arch/i386/mb.S
+ freeldr/freeldr/arch/i386/i386bug.c)
+endif()
elseif(ARCH MATCHES amd64)
list(APPEND FREELDR_BASE64K_SOURCE
- freeldr/freeldr/arch/amd64/drvmap.S
- freeldr/freeldr/arch/amd64/i386cpu.S
- freeldr/freeldr/arch/amd64/i386idt.S
- freeldr/freeldr/arch/amd64/i386trap.S
+ freeldr/freeldr/arch/i386/drvmap.S
+ freeldr/freeldr/arch/i386/i386cpu.S
+ freeldr/freeldr/arch/i386/i386idt.S
+ freeldr/freeldr/arch/i386/i386trap.S
freeldr/freeldr/arch/amd64/mb.S)
endif(ARCH MATCHES i386)
freeldr/freeldr/disk/disk.c
freeldr/freeldr/disk/partition.c
freeldr/freeldr/disk/ramdisk.c
+ freeldr/freeldr/disk/scsiport.c
freeldr/freeldr/fs/ext2.c
freeldr/freeldr/fs/fat.c
freeldr/freeldr/fs/fs.c
if(ARCH MATCHES i386)
list(APPEND FREELDR_ARCH_SOURCE
- freeldr/freeldr/arch/i386/_alloca.S
freeldr/freeldr/arch/i386/archmach.c
freeldr/freeldr/arch/i386/custom.c
freeldr/freeldr/arch/i386/drivemap.c
${CMAKE_CURRENT_BINARY_DIR}/freeldr_freeldr.h.gch
${FREELDR_SOURCE})
-set_target_properties(freeldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,-entry,_mainCRTStartup -Wl,--image-base,0x8000 -Wl,--exclude-all-symbols -Wl,--subsystem,native -Wl,--file-alignment,0x1000 -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds" SUFFIX ".sys")
+if(NOT MSVC)
+set_target_properties(freeldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr/freeldr/freeldr_i386.lnk" SUFFIX ".sys")
+set_image_base(freeldr 0x8000)
+else()
+set_target_properties(freeldr PROPERTIES LINK_FLAGS "/DRIVER /FIXED /ALIGN:0x400 /SECTION:.text,ERW /SECTION:.data,RW /MERGE:.text16=.text /MERGE:.data=.text /MERGE:.rdata=.text /MERGE:.bss=.text /SUBSYSTEM:BOOT_APPLICATION" SUFFIX ".sys")
+set_image_base(freeldr 0x10000)
+endif()
+
+set_subsystem(freeldr native)
+set_entrypoint(freeldr mainCRTStartup)
if(ARCH MATCHES i386)
target_link_libraries(freeldr mini_hal)
rtl
libcntpr)
add_pch(freeldr ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/freeldr/include/freeldr.h ${FREELDR_SOURCE})
+add_dependencies(freeldr ks386)
list(APPEND SETUPLDR_SOURCE
${FREELDR_STARTUP_SOURCE}
add_library(setupldr SHARED ${SETUPLDR_SOURCE})
-set_target_properties(setupldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,-entry,_mainCRTStartup -Wl,--image-base,0x8000 -Wl,--exclude-all-symbols -Wl,--subsystem,native -Wl,--file-alignment,0x1000 -Wl,-T,${REACTOS_SOURCE_DIR}/global.lds" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP")
+if(NOT MSVC)
+set_target_properties(setupldr PROPERTIES LINK_FLAGS "-Wl,--strip-all -Wl,--exclude-all-symbols -Wl,--file-alignment,0x1000 -Wl,-T,${CMAKE_CURRENT_SOURCE_DIR}/freeldr/freeldr/freeldr_i386.lnk" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP")
+set_image_base(setupldr 0x8000)
+else()
+set_target_properties(setupldr PROPERTIES LINK_FLAGS "/SECTION:.text,ERWP,ALIGN=0x1000" SUFFIX ".sys" COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP")
+endif()
+
+set_subsystem(setupldr native)
+set_entrypoint(setupldr mainCRTStartup)
if(ARCH MATCHES i386)
target_link_libraries(setupldr mini_hal)
cmlib
rtl
libcntpr)
-
+
+add_dependencies(setupldr ks386)
+
# Bootcd files
add_minicd_target(setupldr loader setupldr.sys)
add_minicd_target(freeldr loader freeldr.sys)
add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivedef_${ARCH}.inf reactos hivedef.inf)
add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivesft_${ARCH}.inf reactos hivesft.inf)
add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/hivesys_${ARCH}.inf reactos hivesys.inf)
-
+add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/autorun.inf "" autorun.inf)
+add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/icon.ico "" icon.ico)
+add_minicd(${CMAKE_CURRENT_SOURCE_DIR}/bootdata/readme.txt "" readme.txt)
# Livecd files
list(APPEND LIVECD_HIVES
${CMAKE_CURRENT_SOURCE_DIR}/bootdata/livecd.inf
add_custom_target(livecd_hives DEPENDS ${LIVECD_DIR}/reactos/system32/config/sam)
add_livecd_target(setupldr loader)
-add_livecd(${REACTOS_SOURCE_DIR}/boot/bootdata/livecd.ini "" freeldr.ini)
\ No newline at end of file
+add_livecd(${REACTOS_SOURCE_DIR}/boot/bootdata/livecd.ini "" freeldr.ini)