[FREELDR] Unsplit it

Author: iLauncherDev

boot/freeldr/freeldr/CMakeLists.txt

@@ -58,6 +58,11 @@ list(APPEND FREELDR_BOOTLIB_SOURCE
 
 list(APPEND FREELDR_BOOTMGR_SOURCE
     include/freeldr.h
+    custom.c
+    # linuxboot.c
+    miscboot.c
+    options.c
+    oslist.c
     settings.c
     ui/directui.c
     # ui/gui.c
@@ -83,7 +88,10 @@ if(ARCH STREQUAL "i386")
         # arch/i386/linux.S
 
     list(APPEND FREELDR_ARC_SOURCE
-        arch/i386/i386bug.c)
+        arch/i386/i386bug.c
+        arch/i386/halstub.c
+        arch/i386/ntoskrnl.c
+        disk/scsiport.c)
 
     list(APPEND FREELDR_NTLDR_SOURCE
         ntldr/arch/i386/winldr.c
@@ -110,8 +118,14 @@ else()
 endif()
 
 list(APPEND FREELDR_BASE_SOURCE
+    bootmgr.c # This file is compiled with custom definitions
     freeldr.c
-    ntldr/ntldropts.c # Should be in rosload, but is currently needed by machpc.c, etc.
+    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...
+    ntldr/inffile.c
+    ntldr/ntldropts.c
     lib/rtl/libsupp.c)
 
 if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64")
@@ -121,7 +135,6 @@ if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64")
 endif()
 
 include(pcat.cmake)
-include(rosload.cmake)
 if(NOT ARCH STREQUAL "i386" OR NOT (SARCH STREQUAL "pc98" OR SARCH STREQUAL "xbox"))
     include(uefi.cmake)
 endif()

boot/freeldr/freeldr/freeldr.c

@@ -30,6 +30,8 @@ CCHAR FrLdrBootPath[MAX_PATH] = "";
 
 /* FUNCTIONS ******************************************************************/
 
+VOID RunLoader(VOID);
+
 static
 BOOLEAN
 LoadRosload(
@@ -68,6 +70,9 @@ static
 ULONG
 LaunchSecondStageLoader(VOID)
 {
+    RunLoader();
+    return ESUCCESS;
+
     PLDR_DATA_TABLE_ENTRY RosloadDTE;
     PVOID ImageBase;
     LONG (*EntryPoint)(VOID);

boot/freeldr/freeldr/pcat.cmake

@@ -155,6 +155,7 @@ add_library(freeldr_common
     ${PCATLDR_ARC_SOURCE}
     ${FREELDR_BOOTLIB_SOURCE}
     ${PCATLDR_BOOTMGR_SOURCE}
+    ${FREELDR_NTLDR_SOURCE}
 )
 
 if(MSVC AND CMAKE_C_COMPILER_ID STREQUAL "Clang")
@@ -170,6 +171,7 @@ set(PCH_SOURCE
     ${PCATLDR_ARC_SOURCE}
     ${FREELDR_BOOTLIB_SOURCE}
     ${PCATLDR_BOOTMGR_SOURCE}
+    ${FREELDR_NTLDR_SOURCE}
 )
 
 add_pch(freeldr_common include/freeldr.h PCH_SOURCE)
@@ -221,7 +223,7 @@ if(ARCH STREQUAL "i386")
     target_link_libraries(freeldr_pe mini_hal)
 endif()
 
-target_link_libraries(freeldr_pe freeldr_common cportlib libcntpr blrtl)
+target_link_libraries(freeldr_pe freeldr_common cportlib blcmlib blrtl libcntpr)
 
 # dynamic analysis switches
 if(STACK_PROTECTOR)