https://git.reactos.org/?p=reactos.git;a=commitdiff;h=995630cceca4c86dc51587c30fc8bc7367b0c7ca
commit 995630cceca4c86dc51587c30fc8bc7367b0c7ca Author: Hermès Bélusca-Maïto <[email protected]> AuthorDate: Sun Mar 19 17:46:00 2023 +0100 Commit: Hermès Bélusca-Maïto <[email protected]> CommitDate: Sun Mar 19 17:50:55 2023 +0100 [FREELDR] Fix missing exports and .edata section after commit 728694f6. CORE-18880 --- boot/freeldr/freeldr/CMakeLists.txt | 10 +++++----- boot/freeldr/freeldr/pcat.cmake | 6 ------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/boot/freeldr/freeldr/CMakeLists.txt b/boot/freeldr/freeldr/CMakeLists.txt index 2297a4b5c7c..740a0a5192c 100644 --- a/boot/freeldr/freeldr/CMakeLists.txt +++ b/boot/freeldr/freeldr/CMakeLists.txt @@ -128,10 +128,10 @@ list(APPEND FREELDR_BASE_SOURCE ntldr/ntldropts.c lib/rtl/libsupp.c) -# 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() +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() include(pcat.cmake) diff --git a/boot/freeldr/freeldr/pcat.cmake b/boot/freeldr/freeldr/pcat.cmake index a800323c539..24c8e3627f0 100644 --- a/boot/freeldr/freeldr/pcat.cmake +++ b/boot/freeldr/freeldr/pcat.cmake @@ -185,12 +185,6 @@ list(APPEND PCATLDR_BASE_SOURCE ${freeldr_base_asm} ${FREELDR_BASE_SOURCE}) -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_executable(freeldr_pe ${PCATLDR_BASE_SOURCE}) set_target_properties(freeldr_pe
