Author: akhaldi Date: Fri Apr 26 22:31:07 2013 New Revision: 58862
URL: http://svn.reactos.org/svn/reactos?rev=58862&view=rev Log: [HAL] * Account for the asm source files in all the HAL flavors. Should fix compiling them with VS (which regressed recently).
Modified: trunk/reactos/hal/halx86/CMakeLists.txt trunk/reactos/hal/halx86/apic.cmake trunk/reactos/hal/halx86/generic.cmake trunk/reactos/hal/halx86/minihal.cmake trunk/reactos/hal/halx86/pic.cmake
Modified: trunk/reactos/hal/halx86/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/CMakeLists.txt?r... ============================================================================== --- trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/CMakeLists.txt [iso-8859-1] Fri Apr 26 22:31:07 2013 @@ -80,5 +80,3 @@ add_hal(hal SOURCES ${HAL_SOURCE} COMPONENTS generic acpi apic)
endif() - -
Modified: trunk/reactos/hal/halx86/apic.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/apic.cmake?rev=5... ============================================================================== --- trunk/reactos/hal/halx86/apic.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/apic.cmake [iso-8859-1] Fri Apr 26 22:31:07 2013 @@ -10,5 +10,6 @@ apic/rtctimer.c apic/tsc.c)
-add_object_library(lib_hal_apic ${HAL_APIC_SOURCE} ${HAL_APIC_ASM_SOURCE}) +add_asm_files(lib_hal_apic_asm ${HAL_APIC_ASM_SOURCE}) +add_object_library(lib_hal_apic ${HAL_APIC_SOURCE} ${lib_hal_apic_asm}) add_dependencies(lib_hal_apic asm)
Modified: trunk/reactos/hal/halx86/generic.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/generic.cmake?re... ============================================================================== --- trunk/reactos/hal/halx86/generic.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/generic.cmake [iso-8859-1] Fri Apr 26 22:31:07 2013 @@ -21,7 +21,7 @@ generic/v86.S) endif()
-add_asm_files(halacpi_asm ${HAL_PIC_ASM_SOURCE} generic/v86.S) -add_object_library(lib_hal_generic ${HAL_GENERIC_SOURCE} ${HAL_GENERIC_ASM_SOURCE}) +add_asm_files(lib_hal_generic_asm ${HAL_GENERIC_ASM_SOURCE}) +add_object_library(lib_hal_generic ${HAL_GENERIC_SOURCE} ${lib_hal_generic_asm}) add_dependencies(lib_hal_generic asm) add_pch(lib_hal_generic include/hal.h)
Modified: trunk/reactos/hal/halx86/minihal.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/minihal.cmake?re... ============================================================================== --- trunk/reactos/hal/halx86/minihal.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/minihal.cmake [iso-8859-1] Fri Apr 26 22:31:07 2013 @@ -1,8 +1,6 @@ -
list(APPEND MINI_HAL_SOURCE generic/portio.c - generic/systimer.S legacy/bus/bushndlr.c legacy/bus/cmosbus.c legacy/bus/isabus.c @@ -27,6 +25,7 @@ up/processor.c)
# mini_hal -add_library(mini_hal ${MINI_HAL_SOURCE}) +add_asm_files(mini_hal_asm generic/systimer.S) +add_library(mini_hal ${MINI_HAL_SOURCE} ${mini_hal_asm}) add_target_compile_definitions(mini_hal _BLDR_ _MINIHAL_) add_dependencies(mini_hal psdk bugcodes asm)
Modified: trunk/reactos/hal/halx86/pic.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/pic.cmake?rev=58... ============================================================================== --- trunk/reactos/hal/halx86/pic.cmake [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/pic.cmake [iso-8859-1] Fri Apr 26 22:31:07 2013 @@ -9,5 +9,6 @@ up/halinit_up.c up/pic.c)
-add_object_library(lib_hal_pic ${HAL_PIC_SOURCE} ${HAL_PIC_ASM_SOURCE}) +add_asm_files(lib_hal_pic_asm ${HAL_PIC_ASM_SOURCE}) +add_object_library(lib_hal_pic ${HAL_PIC_SOURCE} ${lib_hal_pic_asm}) add_dependencies(lib_hal_pic asm)