Author: akhaldi
Date: Thu Nov 4 21:38:28 2010
New Revision: 49471
URL:
http://svn.reactos.org/svn/reactos?rev=49471&view=rev
Log:
[CMAKE]
- Improve hal, adns and bzip2.
Modified:
branches/cmake-bringup/hal/CMakeLists.txt
branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt
branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt
Modified: branches/cmake-bringup/hal/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/CMakeLists.tx…
==============================================================================
--- branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] Thu Nov 4 21:38:28 2010
@@ -1,11 +1,13 @@
if(ARCH MATCHES i386)
-add_definitions(-D_NTHALDLL_)
-add_definitions(-D_NTHAL_)
+add_definitions(
+ -D_NTHALDLL_
+ -D_NTHAL_)
-include_directories(halx86/include)
-include_directories(${REACTOS_SOURCE_DIR}/ntoskrnl/include)
+include_directories(
+ halx86/include
+ ${REACTOS_SOURCE_DIR}/ntoskrnl/include)
list(APPEND HAL_GENERIC_SOURCE
halx86/generic/beep.c
@@ -43,8 +45,6 @@
halx86/up/pic.c
halx86/up/processor.c)
-
-
list(APPEND HAL_SOURCE
${CMAKE_CURRENT_BINARY_DIR}/hal_hal.h.gch
${HAL_GENERIC_SOURCE}
@@ -57,11 +57,14 @@
add_pch(hal ${CMAKE_CURRENT_SOURCE_DIR}/halx86/include/hal.h ${HAL_SOURCE})
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
${CMAKE_CURRENT_SOURCE_DIR}/halx86/hal_i386.def
- -lntoskrnl
libcntpr)
list(APPEND MINI_HAL_SOURCE
Modified: branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/adns…
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/adns/CMakeLists.txt [iso-8859-1] Thu Nov 4
21:38:28 2010
@@ -1,9 +1,11 @@
-include_directories(src)
-include_directories(adns_win32)
+include_directories(
+ src
+ adns_win32)
-add_definitions(-D_DLL -D__USE_CRTIMP)
-add_definitions(-DADNS_JGAA_WIN32)
+add_definitions(
+ -D_DLL -D__USE_CRTIMP
+ -DADNS_JGAA_WIN32)
list(APPEND SOURCE
adns_win32/adns_unix_calls.c
Modified: branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/3rdparty/bzip…
==============================================================================
--- branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/lib/3rdparty/bzip2/CMakeLists.txt [iso-8859-1] Thu Nov 4
21:38:28 2010
@@ -1,3 +1,4 @@
+
add_definitions(-DBZ_NO_STDIO -DBZ_DECOMPRESS_ONLY)
spec2def(bzip2 unbzip2.spec)
@@ -13,8 +14,7 @@
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_dependencies(bzip2 bugcodes)
+set_target_properties(bzip2 PROPERTIES OUTPUT_NAME "unbzip2")