Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 23:03:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

[CMAKE]

Browse source 
- "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

svn path=/branches/cmake-bringup/; revision=49367
This commit is contained in:
Amine Khaldi 2010-10-30 22:03:40 +00:00
parent 5afba1c7f7
commit a2e649110b
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dll/win32/imaadp32.acm/CMakeLists.txt
View file

@ -6,14 +6,14 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(imaadp32.acm imaadp32.acm.spec) 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) ${CMAKE_CURRENT_BINARY_DIR}/imaadp32.def)
set_entrypoint(imaadp32 0) set_entrypoint(imaadp32.acm 0)
set_target_properties(imaadp32 PROPERTIES SUFFIX "acm") 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_importlibs(imaadp32.acm winmm user32 msvcrt kernel32 ntdll)
add_dependencies(imaadp32 psdk buildno_header) add_dependencies(imaadp32.acm psdk buildno_header)
add_cab_target(imaadp32 1) add_cab_target(imaadp32.acm 1)

4
drivers/storage/class/class2/CMakeLists.txt
View file

@ -5,12 +5,12 @@ include_directories(..)
spec2def(class2.sys class2.spec) spec2def(class2.sys class2.spec)
add_library(class2 SHARED class2.c class2.rc add_library(class2 SHARED class2.c class2.rc)
${CMAKE_CURRENT_BINARY_DIR}/class2.def)
set_target_properties(class2 PROPERTIES LINK_FLAGS "-Wl,-entry,_DriverEntry@8 -Wl,--image-base,0x00010000 -Wl,--exclude-all-symbols -Wl,--subsystem,native" SUFFIX ".sys") 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 target_link_libraries(class2
${CMAKE_CURRENT_BINARY_DIR}/class2.def
-lscsiport -lscsiport
-lntoskrnl -lntoskrnl
-lhal) -lhal)

4
ntoskrnl/CMakeLists.txt
View file

@ -241,8 +241,7 @@ list(APPEND SOURCE
vf/driver.c vf/driver.c
wmi/wmi.c wmi/wmi.c
ntoskrnl.rc ntoskrnl.rc
${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S ${REACTOS_BINARY_DIR}/ntoskrnl/ex/zw.S)
${CMAKE_CURRENT_SOURCE_DIR}/ntoskrnl_${ARCH}.def)
if(ARCH MATCHES i386) if(ARCH MATCHES i386)
list(APPEND SOURCE list(APPEND SOURCE
@ -405,6 +404,7 @@ add_executable(ntoskrnl ${SOURCE} ${CMAKE_CURRENT_BINARY_DIR}/ntoskrnl_ntoskrnl.
set_target_properties(ntoskrnl PROPERTIES LINK_FLAGS "-Wl,-entry,_KiSystemStartup@4 -Wl,--image-base,0x80800000 -Wl,--subsystem,native") set_target_properties(ntoskrnl PROPERTIES LINK_FLAGS "-Wl,-entry,_KiSystemStartup@4 -Wl,--image-base,0x80800000 -Wl,--subsystem,native")
target_link_libraries(ntoskrnl target_link_libraries(ntoskrnl
${CMAKE_CURRENT_SOURCE_DIR}/ntoskrnl_${ARCH}.def
cportlib cportlib
csq csq
-lhal -lhal