From 8b7d047834a2e6bc84471489dd75f72ed59bb88a Mon Sep 17 00:00:00 2001 From: Timo Kreuzer Date: Fri, 19 Nov 2010 22:02:33 +0000 Subject: [PATCH 1/1] [CMAKE] - Add asm dependencies to freeldr, ntdll, crt - Add importlib for hal and ntoskrnl - Fix ntoskrnl spec file - Fix resource pathes in ntoskrnl.rc svn path=/branches/cmake-bringup/; revision=49645 --- boot/CMakeLists.txt | 4 ++-- dll/ntdll/CMakeLists.txt | 2 +- hal/CMakeLists.txt | 4 +++- lib/sdk/crt/CMakeLists.txt | 2 +- ntoskrnl/CMakeLists.txt | 5 +++-- ntoskrnl/ntoskrnl.rc | 24 ++++++++++++------------ ntoskrnl/ntoskrnl.spec | 2 +- 7 files changed, 23 insertions(+), 20 deletions(-) diff --git a/boot/CMakeLists.txt b/boot/CMakeLists.txt index 04be39da485..78bc3d7b25b 100644 --- a/boot/CMakeLists.txt +++ b/boot/CMakeLists.txt @@ -200,7 +200,7 @@ target_link_libraries(freeldr rtl libcntpr) add_pch(freeldr ${CMAKE_CURRENT_SOURCE_DIR}/freeldr/freeldr/include/freeldr.h ${FREELDR_SOURCE}) -add_dependencies(freeldr ks386) +add_dependencies(freeldr asm) list(APPEND SETUPLDR_SOURCE ${FREELDR_STARTUP_SOURCE} @@ -232,7 +232,7 @@ target_link_libraries(setupldr rtl libcntpr) -add_dependencies(setupldr ks386) +add_dependencies(setupldr asm) # Bootcd files add_minicd_target(setupldr loader setupldr.sys) diff --git a/dll/ntdll/CMakeLists.txt b/dll/ntdll/CMakeLists.txt index d464084e3ab..77ee4c6e0ae 100644 --- a/dll/ntdll/CMakeLists.txt +++ b/dll/ntdll/CMakeLists.txt @@ -51,7 +51,7 @@ target_link_libraries(ntdll ${PSEH_LIB}) add_pch(ntdll ${CMAKE_CURRENT_SOURCE_DIR}/include/ntdll.h ${SOURCE}) -add_dependencies(ntdll ntstatus) +add_dependencies(ntdll ntstatus asm) add_minicd_target(ntdll reactos/system32 ntdll.dll) add_cab_target(ntdll 1) diff --git a/hal/CMakeLists.txt b/hal/CMakeLists.txt index 252024975b8..74a0e1586c5 100644 --- a/hal/CMakeLists.txt +++ b/hal/CMakeLists.txt @@ -104,4 +104,6 @@ add_minicd_target(hal reactos hal.dll) add_livecd_target(hal reactos/system32) else() #TBD -endif(ARCH MATCHES i386) \ No newline at end of file +endif(ARCH MATCHES i386) + +add_importlib_target(hal.spec) \ No newline at end of file diff --git a/lib/sdk/crt/CMakeLists.txt b/lib/sdk/crt/CMakeLists.txt index 47c84fb42dc..76e907ee8f1 100644 --- a/lib/sdk/crt/CMakeLists.txt +++ b/lib/sdk/crt/CMakeLists.txt @@ -413,7 +413,7 @@ add_library(crt ${CMAKE_CURRENT_BINARY_DIR}/crt_precomp.h.gch ${CRT_SOURCE}) set_property(TARGET crt PROPERTY COMPILE_DEFINITIONS __MINGW_IMPORT=extern USE_MSVCRT_PREFIX _MSVCRT_LIB_ _MSVCRT_ _MT) add_pch(crt ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${CRT_SOURCE}) -add_dependencies(crt psdk buildno_header ks386) +add_dependencies(crt psdk buildno_header asm) list(APPEND LIBCNTPR_SOURCE except/${ARCH}/chkstk_asm.s diff --git a/ntoskrnl/CMakeLists.txt b/ntoskrnl/CMakeLists.txt index 9504ddcfb96..b6db53fef1b 100644 --- a/ntoskrnl/CMakeLists.txt +++ b/ntoskrnl/CMakeLists.txt @@ -426,7 +426,8 @@ add_importlibs(ntoskrnl hal kdcom bootvid) add_pch(ntoskrnl ${CMAKE_CURRENT_SOURCE_DIR}/include/ntoskrnl.h ${SOURCE}) set_source_files_properties(${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S PROPERTIES GENERATED TRUE) -add_dependencies(ntoskrnl psdk bugcodes kernel_zw kernel_napi) +add_dependencies(ntoskrnl psdk bugcodes kernel_zw kernel_napi asm) add_minicd_target(ntoskrnl reactos ntoskrnl.exe) -add_livecd_target(ntoskrnl reactos/system32) \ No newline at end of file +add_livecd_target(ntoskrnl reactos/system32) +add_importlib_target(ntoskrnl.spec) \ No newline at end of file diff --git a/ntoskrnl/ntoskrnl.rc b/ntoskrnl/ntoskrnl.rc index 090bff5e44d..5257fe90181 100644 --- a/ntoskrnl/ntoskrnl.rc +++ b/ntoskrnl/ntoskrnl.rc @@ -23,20 +23,20 @@ #endif #define VER_LANGNEUTRAL #include "common.ver" -#include "resource.h" +#include "include/resource.h" // // Bug Codes and Bitmaps // #include "bugcodes.rc" -IDB_BOOT_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/1.bmp" -IDB_HIBERNATE_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/2.bmp" -IDB_SHUTDOWN_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/3.bmp" -IDB_BAR_SERVER BITMAP DISCARDABLE "ntoskrnl/inbv/logo/4.bmp" -IDB_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/5.bmp" -IDB_LOGO_HEADER BITMAP DISCARDABLE "ntoskrnl/inbv/logo/6.bmp" -IDB_LOGO_BAND BITMAP DISCARDABLE "ntoskrnl/inbv/logo/7.bmp" -IDB_BAR_PRO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/8.bmp" -IDB_SERVER_LOGO BITMAP DISCARDABLE "ntoskrnl/inbv/logo/5.bmp" -IDB_SERVER_HEADER BITMAP DISCARDABLE "ntoskrnl/inbv/logo/14.bmp" -IDB_SERVER_BAND BITMAP DISCARDABLE "ntoskrnl/inbv/logo/15.bmp" +IDB_BOOT_LOGO BITMAP DISCARDABLE "inbv/logo/1.bmp" +IDB_HIBERNATE_LOGO BITMAP DISCARDABLE "inbv/logo/2.bmp" +IDB_SHUTDOWN_LOGO BITMAP DISCARDABLE "inbv/logo/3.bmp" +IDB_BAR_SERVER BITMAP DISCARDABLE "inbv/logo/4.bmp" +IDB_LOGO BITMAP DISCARDABLE "inbv/logo/5.bmp" +IDB_LOGO_HEADER BITMAP DISCARDABLE "inbv/logo/6.bmp" +IDB_LOGO_BAND BITMAP DISCARDABLE "inbv/logo/7.bmp" +IDB_BAR_PRO BITMAP DISCARDABLE "inbv/logo/8.bmp" +IDB_SERVER_LOGO BITMAP DISCARDABLE "inbv/logo/5.bmp" +IDB_SERVER_HEADER BITMAP DISCARDABLE "inbv/logo/14.bmp" +IDB_SERVER_BAND BITMAP DISCARDABLE "inbv/logo/15.bmp" diff --git a/ntoskrnl/ntoskrnl.spec b/ntoskrnl/ntoskrnl.spec index af37a1a3ea6..dcf92395ddb 100644 --- a/ntoskrnl/ntoskrnl.spec +++ b/ntoskrnl/ntoskrnl.spec @@ -700,7 +700,7 @@ @ fastcall KefAcquireSpinLockAtDpcLevel(ptr) @ fastcall KefReleaseSpinLockFromDpcLevel(ptr) @ stdcall -arch=i386 Kei386EoiHelper() -@ fastcall -arch=i386 KiEoiHelper(ptr) /* FIXME: Evaluate decision */ +@ fastcall -arch=i386 KiEoiHelper(ptr) @ fastcall KiAcquireSpinLock(ptr) @ extern KiBugCheckData @ stdcall KiCheckForKernelApcDelivery() -- 2.17.1