[akhaldi] 50534: [CMAKE] - Share freeldr_arch as a static lib between freeldr and setupldr. - Some formatting fixes.

Author: akhaldi
Date: Fri Jan 28 11:40:45 2011
New Revision: 50534

URL: http://svn.reactos.org/svn/reactos?rev=50534&view=rev
Log:
[CMAKE]
- Share freeldr_arch as a static lib between freeldr and setupldr.
- Some formatting fixes.

Modified:
    branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt

Modified: branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/freeldr/free…
==============================================================================
--- branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/boot/freeldr/freeldr/CMakeLists.txt [iso-8859-1] Fri Jan 28
11:40:45 2011
@@ -9,44 +9,42 @@
 endif()
 
 if(ARCH MATCHES i386)
-if(MSVC)
-list(APPEND FREELDR_BASE64K_SOURCE
-    arch/i386/realmode.S)
-else()
-list(APPEND FREELDR_STARTUP_SOURCE
-    arch/i386/fathelp.S
-    arch/i386/arch.S)
-endif()
+    if(MSVC)
+        list(APPEND FREELDR_BASE64K_SOURCE
+            arch/i386/realmode.S)
+    else()
+        list(APPEND FREELDR_STARTUP_SOURCE
+            arch/i386/fathelp.S
+            arch/i386/arch.S)
+    endif()
 elseif(ARCH MATCHES amd64)
-list(APPEND FREELDR_STARTUP_SOURCE
-    arch/i386/fathelp.S
-    arch/amd64/arch.S)
-endif(ARCH MATCHES i386)
-
-if(ARCH MATCHES i386)
-if(NOT MSVC)
-list(APPEND FREELDR_BASE64K_SOURCE
-    arch/i386/boot.S
-    arch/i386/drvmap.S
-    arch/i386/i386cpu.S
-    arch/i386/i386idt.S
-    arch/i386/i386pnp.S
-    arch/i386/i386trap.S
-    arch/i386/int386.S
-    arch/i386/linux.S
-    arch/i386/mb.S
-    arch/i386/i386bug.c)
-endif()
+    list(APPEND FREELDR_STARTUP_SOURCE
+        arch/i386/fathelp.S
+        arch/amd64/arch.S)
+endif()
+
+if(ARCH MATCHES i386)
+    if(NOT MSVC)
+        list(APPEND FREELDR_BASE64K_SOURCE
+            arch/i386/boot.S
+            arch/i386/drvmap.S
+            arch/i386/i386cpu.S
+            arch/i386/i386idt.S
+            arch/i386/i386pnp.S
+            arch/i386/i386trap.S
+            arch/i386/int386.S
+            arch/i386/linux.S
+            arch/i386/mb.S
+            arch/i386/i386bug.c)
+    endif()
 elseif(ARCH MATCHES amd64)
-list(APPEND FREELDR_BASE64K_SOURCE
-    arch/i386/drvmap.S
-    arch/i386/i386cpu.S
-    arch/i386/i386idt.S
-    arch/i386/i386trap.S
-    arch/amd64/mb.S)
-endif(ARCH MATCHES i386)
-
-
+    list(APPEND FREELDR_BASE64K_SOURCE
+        arch/i386/drvmap.S
+        arch/i386/i386cpu.S
+        arch/i386/i386idt.S
+        arch/i386/i386trap.S
+        arch/amd64/mb.S)
+endif()
 
 set_source_files_properties(${FREELDR_BASE64K_SOURCE} PROPERTIES COMPILE_DEFINITIONS
"_NTHAL_")
 
@@ -105,10 +103,10 @@
     oslist.c)
 
 if(ARCH MATCHES i386)
-list(APPEND FREELDR_BASE_SOURCE
-    windows/headless.c
-    disk/scsiport.c)
-endif(ARCH MATCHES i386)
+    list(APPEND FREELDR_BASE_SOURCE
+        windows/headless.c
+        disk/scsiport.c)
+endif()
 
 set_source_files_properties(${FREELDR_BASE_SOURCE} PROPERTIES COMPILE_DEFINITIONS
"_NTHAL_;_BLDR_;_NTSYSTEM_")
 
@@ -116,75 +114,61 @@
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/elf)
 
 if(ARCH MATCHES i386)
-list(APPEND FREELDR_ARCH_SOURCE
-    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/hwpci.c
-    arch/i386/i386disk.c
-    arch/i386/i386rtl.c
-    arch/i386/i386vid.c
-    arch/i386/loader.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/pcrtc.c
-    arch/i386/pcvideo.c
-    arch/i386/machxbox.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
-    windows/i386/ntsetup.c
-    windows/i386/wlmemory.c)
+    list(APPEND FREELDR_ARCH_SOURCE
+        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/hwpci.c
+        arch/i386/i386disk.c
+        arch/i386/i386rtl.c
+        arch/i386/i386vid.c
+        arch/i386/loader.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/pcrtc.c
+        arch/i386/pcvideo.c
+        arch/i386/machxbox.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
+        windows/i386/ntsetup.c
+        windows/i386/wlmemory.c)
 else()
 #TBD
-endif(ARCH MATCHES i386)
+endif()
 
 set_source_files_properties(${FREELDR_ARCH_SOURCE} PROPERTIES COMPILE_DEFINITIONS
"_NTHAL_;_BLDR_;_NTSYSTEM_")
-
-list(APPEND SETUPLDR_MAIN_SOURCE
-    bootmgr.c
-    inffile/inffile.c
-    reactos/setupldr.c)
-
-if(ARCH MATCHES i386)
-list(APPEND SETUPLDR_MAIN_SOURCE windows/setupldr2.c)
-elseif(ARCH MATCHES amd64)
-list(APPEND SETUPLDR_MAIN_SOURCE windows/setupldr2.c)
-endif(ARCH MATCHES i386)
-
-set_source_files_properties(${SETUPLDR_MAIN_SOURCE} PROPERTIES COMPILE_FLAGS
"-ffreestanding -fno-builtin -fno-inline -fno-zero-initialized-in-bss")
-
-
+add_library(freeldr_arch ${FREELDR_ARCH_SOURCE})
 
 list(APPEND FREELDR_SOURCE
     bootmgr.c
     ${FREELDR_STARTUP_SOURCE}
     ${FREELDR_BASE64K_SOURCE}
     ${FREELDR_BASE_SOURCE}
-    ${FREELDR_ARCH_SOURCE})
+    )
 
 add_library(freeldr SHARED
     ${CMAKE_CURRENT_BINARY_DIR}/freeldr_freeldr.h.gch
     ${FREELDR_SOURCE})
 
 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_i386.lnk" SUFFIX ".sys")
+    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_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_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()
 
@@ -192,42 +176,55 @@
 set_entrypoint(freeldr mainCRTStartup)
 
 if(ARCH MATCHES i386)
-target_link_libraries(freeldr mini_hal)
-endif(ARCH MATCHES i386)
+    target_link_libraries(freeldr mini_hal)
+endif()
 
 target_link_libraries(freeldr
+    freeldr_arch
     cportlib
     rossym
     cmlib
     rtl
     libcntpr)
+
 add_pch(freeldr ${CMAKE_CURRENT_SOURCE_DIR}/include/freeldr.h ${FREELDR_SOURCE})
 add_dependencies(freeldr asm)
+
+list(APPEND SETUPLDR_MAIN_SOURCE
+    bootmgr.c
+    inffile/inffile.c
+    reactos/setupldr.c)
+
+if(ARCH MATCHES i386 OR ARCH MATCHES amd64)
+    list(APPEND SETUPLDR_MAIN_SOURCE windows/setupldr2.c)
+endif()
+
+set_source_files_properties(${SETUPLDR_MAIN_SOURCE} PROPERTIES COMPILE_FLAGS
"-ffreestanding -fno-builtin -fno-inline -fno-zero-initialized-in-bss")
 
 list(APPEND SETUPLDR_SOURCE
     ${FREELDR_STARTUP_SOURCE}
     ${FREELDR_BASE64K_SOURCE}
     ${FREELDR_BASE_SOURCE}
-    ${FREELDR_ARCH_SOURCE}
     ${SETUPLDR_MAIN_SOURCE})
 
 add_library(setupldr SHARED ${SETUPLDR_SOURCE})
 
 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_i386.lnk" SUFFIX ".sys"
COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP")
+    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_i386.lnk" SUFFIX ".sys"
COMPILE_DEFINITIONS "FREELDR_REACTOS_SETUP")
 set_image_base(setupldr 0x8000)
 else()
-set_target_properties(setupldr PROPERTIES LINK_FLAGS "/DRIVER
/SECTION:.text,ERWP,ALIGN=0x1000" SUFFIX ".sys" COMPILE_DEFINITIONS
"FREELDR_REACTOS_SETUP")
+    set_target_properties(setupldr PROPERTIES LINK_FLAGS "/DRIVER
/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)
-endif(ARCH MATCHES i386)
+    target_link_libraries(setupldr mini_hal)
+endif()
 
 target_link_libraries(setupldr
+    freeldr_arch
     cportlib
     rossym
     cmlib
@@ -239,4 +236,4 @@
 # Bootcd files
 add_minicd_target(setupldr loader setupldr.sys)
 add_minicd_target(freeldr loader freeldr.sys)
-add_livecd_target(setupldr loader)
+add_livecd_target(setupldr loader)