[tkreuzer] 49645: [CMAKE] - Add asm dependencies to freeldr, ntdll, crt - Add importlib for hal and ntoskrnl - Fix ntoskrnl spec file - Fix resource pathes in ntoskrnl.rc
Author: tkreuzer Date: Fri Nov 19 22:02:33 2010 New Revision: 49645
URL: http://svn.reactos.org/svn/reactos?rev=49645&view=rev Log: [CMAKE] - Add asm dependencies to freeldr, ntdll, crt - Add importlib for hal and ntoskrnl - Fix ntoskrnl spec file - Fix resource pathes in ntoskrnl.rc
Modified: branches/cmake-bringup/boot/CMakeLists.txt branches/cmake-bringup/dll/ntdll/CMakeLists.txt branches/cmake-bringup/hal/CMakeLists.txt branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt branches/cmake-bringup/ntoskrnl/CMakeLists.txt branches/cmake-bringup/ntoskrnl/ntoskrnl.rc branches/cmake-bringup/ntoskrnl/ntoskrnl.spec
Modified: branches/cmake-bringup/boot/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/boot/CMakeLists.tx... ============================================================================== --- branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/boot/CMakeLists.txt [iso-8859-1] Fri Nov 19 22:02:33 2010 @@ -200,7 +200,7 @@ 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 @@ rtl libcntpr)
-add_dependencies(setupldr ks386) +add_dependencies(setupldr asm)
# Bootcd files add_minicd_target(setupldr loader setupldr.sys)
Modified: branches/cmake-bringup/dll/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/ntdll/CMakeLis... ============================================================================== --- branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/dll/ntdll/CMakeLists.txt [iso-8859-1] Fri Nov 19 22:02:33 2010 @@ -51,7 +51,7 @@ ${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)
Modified: branches/cmake-bringup/hal/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/hal/CMakeLists.txt... ============================================================================== --- branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/hal/CMakeLists.txt [iso-8859-1] Fri Nov 19 22:02:33 2010 @@ -104,4 +104,6 @@ add_livecd_target(hal reactos/system32) else() #TBD -endif(ARCH MATCHES i386) +endif(ARCH MATCHES i386) + +add_importlib_target(hal.spec)
Modified: branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/lib/sdk/crt/CMakeL... ============================================================================== --- branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/lib/sdk/crt/CMakeLists.txt [iso-8859-1] Fri Nov 19 22:02:33 2010 @@ -413,7 +413,7 @@
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
Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeList... ============================================================================== --- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Fri Nov 19 22:02:33 2010 @@ -426,7 +426,8 @@
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) +add_livecd_target(ntoskrnl reactos/system32) +add_importlib_target(ntoskrnl.spec)
Modified: branches/cmake-bringup/ntoskrnl/ntoskrnl.rc URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ntoskrnl.... ============================================================================== --- branches/cmake-bringup/ntoskrnl/ntoskrnl.rc [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/ntoskrnl.rc [iso-8859-1] Fri Nov 19 22:02:33 2010 @@ -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"
Modified: branches/cmake-bringup/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/ntoskrnl.... ============================================================================== --- branches/cmake-bringup/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ branches/cmake-bringup/ntoskrnl/ntoskrnl.spec [iso-8859-1] Fri Nov 19 22:02:33 2010 @@ -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()
-
tkreuzer＠svn.reactos.org