Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-04-20 12:29:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[HALACPI]

Browse source 
* Add to build. Dedicated to Cameron.
[SPEC2DEF]
* Add an option to set the name of the output def file.

svn path=/trunk/; revision=53264
This commit is contained in:
Amine Khaldi 2011-08-15 15:36:25 +00:00
parent 36b3277b89
commit 2583d5f4fb
3 changed files with 32 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reactos/cmake/gcc.cmake
View file

@ -268,7 +268,13 @@ function(add_importlib_target _exports_file)
endfunction() endfunction()
function(spec2def _dllname _spec_file) function(spec2def _dllname _spec_file)
if(${ARGC} GREATER 2)
set(_file ${ARGV2})
else()
get_filename_component(_file ${_spec_file} NAME_WE) get_filename_component(_file ${_spec_file} NAME_WE)
endif()
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c
COMMAND native-spec2def -n=${_dllname} --kill-at -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} COMMAND native-spec2def -n=${_dllname} --kill-at -a=${ARCH2} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}

4
reactos/cmake/msvc.cmake
View file

@ -186,7 +186,11 @@ macro(add_delay_importlibs MODULE)
endmacro() endmacro()
function(spec2def _dllname _spec_file) function(spec2def _dllname _spec_file)
if(${ARGC} GREATER 2)
set(_file ${ARGV2})
else()
get_filename_component(_file ${_spec_file} NAME_WE) get_filename_component(_file ${_spec_file} NAME_WE)
endif()
add_custom_command( add_custom_command(
OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_file}.def ${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c
COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}

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

@ -47,6 +47,8 @@ list(APPEND HAL_GENERIC_ACPI_SOURCE
generic/legacy/bus/pcibus.c) generic/legacy/bus/pcibus.c)
if(ARCH MATCHES i386) if(ARCH MATCHES i386)
list(APPEND HAL_GENERIC_ACPI_SOURCE
generic/halinit.c)
list(APPEND HAL_GENERIC_UP_SOURCE list(APPEND HAL_GENERIC_UP_SOURCE
generic/spinlock.c generic/spinlock.c
@ -102,6 +104,24 @@ if(ARCH MATCHES i386)
add_cd_file(TARGET hal DESTINATION reactos/system32 NO_CAB FOR all) add_cd_file(TARGET hal DESTINATION reactos/system32 NO_CAB FOR all)
# hal acpi
spec2def(halacpi.dll ../hal.spec halacpi)
add_library(halacpi SHARED
${HAL_GENERIC_SOURCE}
${HAL_GENERIC_ACPI_SOURCE}
${HAL_GENERIC_UP_SOURCE}
up/halinit_up.c
up/halup.rc
${CMAKE_CURRENT_BINARY_DIR}/halacpi.def)
add_dependencies(halacpi psdk bugcodes)
set_entrypoint(halacpi HalInitSystem@8)
set_subsystem(halacpi native)
set_image_base(halacpi 0x00010000)
add_importlibs(halacpi ntoskrnl)
target_link_libraries(halacpi libcntpr)
set_property(TARGET halacpi PROPERTY COMPILE_DEFINITIONS CONFIG_ACPI)
add_cd_file(TARGET halacpi DESTINATION reactos/system32 NO_CAB FOR all)
# mini_hal # mini_hal
add_library(mini_hal ${MINI_HAL_SOURCE}) add_library(mini_hal ${MINI_HAL_SOURCE})
set_property(TARGET mini_hal PROPERTY COMPILE_DEFINITIONS "_BLDR_;_MINIHAL_") set_property(TARGET mini_hal PROPERTY COMPILE_DEFINITIONS "_BLDR_;_MINIHAL_")