[HAL]

* Account for the asm source files in all the HAL flavors. Should fix compiling them with VS (which regressed recently).

svn path=/trunk/; revision=58862

diff --git a/reactos/hal/halx86/CMakeLists.txt b/reactos/hal/halx86/CMakeLists.txt
index c4bb719..6381b4a 100644 (file)
--- a/reactos/hal/halx86/CMakeLists.txt
+++ b/reactos/hal/halx86/CMakeLists.txt
@@ -80,5 +80,3 @@ elseif(ARCH STREQUAL "amd64")
     add_hal(hal SOURCES ${HAL_SOURCE} COMPONENTS generic acpi apic)
 
 endif()
-
-

diff --git a/reactos/hal/halx86/apic.cmake b/reactos/hal/halx86/apic.cmake
index 8fd16fe..6349e72 100644 (file)
--- a/reactos/hal/halx86/apic.cmake
+++ b/reactos/hal/halx86/apic.cmake
@@ -10,5 +10,6 @@ list(APPEND HAL_APIC_SOURCE
     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)

diff --git a/reactos/hal/halx86/generic.cmake b/reactos/hal/halx86/generic.cmake
index 129f64c..3107f3b 100644 (file)
--- a/reactos/hal/halx86/generic.cmake
+++ b/reactos/hal/halx86/generic.cmake
@@ -21,7 +21,7 @@ if(ARCH STREQUAL "i386")
         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)

diff --git a/reactos/hal/halx86/minihal.cmake b/reactos/hal/halx86/minihal.cmake
index 0d7bb30..036c814 100644 (file)
--- a/reactos/hal/halx86/minihal.cmake
+++ b/reactos/hal/halx86/minihal.cmake
@@ -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 @@ list(APPEND MINI_HAL_SOURCE
     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)

diff --git a/reactos/hal/halx86/pic.cmake b/reactos/hal/halx86/pic.cmake
index f06ed8b..9a470cc 100644 (file)
--- a/reactos/hal/halx86/pic.cmake
+++ b/reactos/hal/halx86/pic.cmake
@@ -9,5 +9,6 @@ list(APPEND HAL_PIC_SOURCE
     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)