Author: akhaldi
Date: Sat Oct 30 22:03:40 2010
New Revision: 49367
URL:
http://svn.reactos.org/svn/reactos?rev=49367&view=rev
Log:
[CMAKE]
- "cmake gracefully handles def files as source files" You mean it gracefully
ignores them, right ?
- Fix the kernel and class2 exports. More to come.
- Fix imaadp32.acm
Modified:
branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt
branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt
branches/cmake-bringup/ntoskrnl/CMakeLists.txt
Modified: branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/win32/imaadp3…
==============================================================================
--- branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/win32/imaadp32.acm/CMakeLists.txt [iso-8859-1] Sat Oct 30
22:03:40 2010
@@ -6,14 +6,14 @@
spec2def(imaadp32.acm imaadp32.acm.spec)
-add_library(imaadp32 SHARED imaadp32.c
+add_library(imaadp32.acm SHARED imaadp32.c
${CMAKE_CURRENT_BINARY_DIR}/imaadp32.def)
-set_entrypoint(imaadp32 0)
-set_target_properties(imaadp32 PROPERTIES SUFFIX "acm")
+set_entrypoint(imaadp32.acm 0)
+set_target_properties(imaadp32.acm PROPERTIES SUFFIX ".acm")
-target_link_libraries(imaadp32 wine)
+target_link_libraries(imaadp32.acm wine)
-add_importlibs(imaadp32 winmm user32 msvcrt kernel32 ntdll)
-add_dependencies(imaadp32 psdk buildno_header)
-add_cab_target(imaadp32 1)
+add_importlibs(imaadp32.acm winmm user32 msvcrt kernel32 ntdll)
+add_dependencies(imaadp32.acm psdk buildno_header)
+add_cab_target(imaadp32.acm 1)
Modified: branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/drivers/storage/c…
==============================================================================
--- branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/drivers/storage/class/class2/CMakeLists.txt [iso-8859-1] Sat
Oct 30 22:03:40 2010
@@ -5,12 +5,12 @@
spec2def(class2.sys class2.spec)
-add_library(class2 SHARED class2.c class2.rc
- ${CMAKE_CURRENT_BINARY_DIR}/class2.def)
+add_library(class2 SHARED class2.c class2.rc)
set_target_properties(class2 PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8
-Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX
".sys")
target_link_libraries(class2
+ ${CMAKE_CURRENT_BINARY_DIR}/class2.def
-lscsiport
-lntoskrnl
-lhal)
Modified: branches/cmake-bringup/ntoskrnl/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/ntoskrnl/CMakeLis…
==============================================================================
--- branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/ntoskrnl/CMakeLists.txt [iso-8859-1] Sat Oct 30 22:03:40 2010
@@ -241,8 +241,7 @@
vf/driver.c
wmi/wmi.c
ntoskrnl.rc
- ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S
- ${CMAKE_CURRENT_SOURCE_DIR}/ntoskrnl_${ARCH}.def)
+ ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S)
if(ARCH MATCHES i386)
list(APPEND SOURCE
@@ -405,6 +404,7 @@
set_target_properties(ntoskrnl PROPERTIES LINK_FLAGS "-Wl,-entry,_KiSystemStartup@4
-Wl,--image-base,0x80800000 -Wl,--subsystem,native")
target_link_libraries(ntoskrnl
+ ${CMAKE_CURRENT_SOURCE_DIR}/ntoskrnl_${ARCH}.def
cportlib
csq
-lhal