Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-26 07:51:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

[HAL]

Browse source 
* 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
This commit is contained in:
Amine Khaldi 2013-04-26 22:31:07 +00:00
parent 0d8b699c25
commit 46483ced1a
5 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/hal/halx86/CMakeLists.txt
View file

@ -80,5 +80,3 @@ elseif(ARCH STREQUAL "amd64")
add_hal(hal SOURCES ${HAL_SOURCE} COMPONENTS generic acpi apic)
endif()

3
reactos/hal/halx86/apic.cmake
View file

@ -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)

4
reactos/hal/halx86/generic.cmake
View file

@ -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)

5
reactos/hal/halx86/minihal.cmake
View file

@ -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)

3
reactos/hal/halx86/pic.cmake
View file

@ -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)