Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-01-10 16:18:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
- Improve hal, adns and bzip2.

svn path=/branches/cmake-bringup/; revision=49471
This commit is contained in:
Amine Khaldi 2010-11-04 21:38:28 +00:00
parent 08bb8bef3d
commit 12ab761aa1
3 changed files with 20 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
hal/CMakeLists.txt
View file

@ -1,11 +1,13 @@
if(ARCH MATCHES i386) if(ARCH MATCHES i386)
add_definitions(-D_NTHALDLL_) add_definitions(
add_definitions(-D_NTHAL_) -D_NTHALDLL_
-D_NTHAL_)
include_directories(halx86/include) include_directories(
include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include) halx86/include
${REACTOS_SOURCE_DIR}/ntoskrnl/include)
list(APPEND HAL_GENERIC_SOURCE list(APPEND HAL_GENERIC_SOURCE
halx86/generic/beep.c halx86/generic/beep.c
@ -43,8 +45,6 @@ list(APPEND HAL_GENERIC_UP_SOURCE
halx86/up/pic.c halx86/up/pic.c
halx86/up/processor.c) halx86/up/processor.c)
list(APPEND HAL_SOURCE list(APPEND HAL_SOURCE
${CMAKE_CURRENT_BINARY_DIR}/hal_hal.h.gch ${CMAKE_CURRENT_BINARY_DIR}/hal_hal.h.gch
${HAL_GENERIC_SOURCE} ${HAL_GENERIC_SOURCE}
@ -57,11 +57,14 @@ add_library(hal SHARED ${HAL_SOURCE})
add_pch(hal ${CMAKE_CURRENT_SOURCE_DIR}/halx86/include/hal.h ${HAL_SOURCE}) add_pch(hal ${CMAKE_CURRENT_SOURCE_DIR}/halx86/include/hal.h ${HAL_SOURCE})
add_dependencies(hal psdk bugcodes) add_dependencies(hal psdk bugcodes)
set_target_properties(hal PROPERTIES LINK_FLAGS "-Wl,-entry,_HalInitSystem@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native") set_entrypoint(hal HalInitSystem@8)
set_subsystem(hal native)
set_image_base(hal 0x00010000)
add_importlibs(hal ntoskrnl)
target_link_libraries(hal target_link_libraries(hal
${CMAKE_CURRENT_SOURCE_DIR}/halx86/hal_i386.def ${CMAKE_CURRENT_SOURCE_DIR}/halx86/hal_i386.def
-lntoskrnl
libcntpr) libcntpr)
list(APPEND MINI_HAL_SOURCE list(APPEND MINI_HAL_SOURCE

10
lib/3rdparty/adns/CMakeLists.txt vendored
View file

@ -1,9 +1,11 @@
include_directories(src) include_directories(
include_directories(adns_win32) src
adns_win32)
add_definitions(-D_DLL -D__USE_CRTIMP) add_definitions(
add_definitions(-DADNS_JGAA_WIN32) -D_DLL -D__USE_CRTIMP
-DADNS_JGAA_WIN32)
list(APPEND SOURCE list(APPEND SOURCE
adns_win32/adns_unix_calls.c adns_win32/adns_unix_calls.c

6
lib/3rdparty/bzip2/CMakeLists.txt vendored
View file

@ -1,3 +1,4 @@
add_definitions(-DBZ_NO_STDIO -DBZ_DECOMPRESS_ONLY) add_definitions(-DBZ_NO_STDIO -DBZ_DECOMPRESS_ONLY)
spec2def(bzip2 unbzip2.spec) spec2def(bzip2 unbzip2.spec)
@ -13,8 +14,7 @@ list(APPEND SOURCE
add_library(bzip2 SHARED ${SOURCE}) add_library(bzip2 SHARED ${SOURCE})
set_target_properties(bzip2 PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--subsystem,native" OUTPUT_NAME "unbzip2") set_module_type(bzip2 kernelmodedriver)
add_importlibs(bzip2 ntoskrnl) add_importlibs(bzip2 ntoskrnl)
add_dependencies(bzip2 bugcodes) set_target_properties(bzip2 PROPERTIES OUTPUT_NAME "unbzip2")