[ros-diffs] [tkreuzer] 49709: [CMAKE] Use spec file for ntoskrnl and set image base to 0x00400000 on MSVC builds. This is the value that Windows has and the ms linker doesn't like to use the kernel address.

tkreuzer at svn.reactos.org tkreuzer at svn.reactos.org
Mon Nov 22 14:11:16 UTC 2010


Author: tkreuzer
Date: Mon Nov 22 14:11:16 2010
New Revision: 49709

URL: http://svn.reactos.org/svn/reactos?rev=49709&view=rev
Log:
[CMAKE]
Use spec file for ntoskrnl and set image base to 0x00400000 on MSVC builds. This is the value that Windows has and the ms linker doesn't like to use the kernel address.

Modified:
    branches/cmake-bringup/ntoskrnl/CMakeLists.txt

Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLists.txt?rev=49709&r1=49708&r2=49709&view=diff
==============================================================================
--- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Mon Nov 22 14:11:16 2010
@@ -1,3 +1,5 @@
+
+spec2def(ntoskrnl.exe ntoskrnl.spec)
 
 include_directories(
     ${REACTOS_SOURCE_DIR}
@@ -246,7 +248,7 @@
     wmi/wmi.c
     ntoskrnl.rc
     ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S
-    ntoskrnl_${ARCH}.def)
+    ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl.def)
     
 set_source_files_properties(ntoskrnl_${ARCH}.def PROPERTIES EXTERNAL_OBJECT TRUE)
 
@@ -408,7 +410,11 @@
 
 set_entrypoint(ntoskrnl KiSystemStartup at 4)
 set_subsystem(ntoskrnl native)
-set_image_base(ntoskrnl 0x80800000)
+if(MSVC)
+  set_image_base(ntoskrnl 0x00400000)
+else()
+  set_image_base(ntoskrnl 0x80800000)
+endif()
 
 target_link_libraries(ntoskrnl
     cportlib




More information about the Ros-diffs mailing list