Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-20 02:13:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[CMAKE]

Browse source 
- Fix shell32.
- Fix and enable mstask.

svn path=/branches/cmake-bringup/; revision=50123
This commit is contained in:
Amine Khaldi 2010-12-24 12:23:19 +00:00
parent f81462977d
commit 682ad4754b
3 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
dll/win32/CMakeLists.txt
View file

@ -100,7 +100,7 @@ add_subdirectory(msisys.ocx)
add_subdirectory(msrle32)
add_subdirectory(mssign32)
add_subdirectory(mssip32)
#add_subdirectory(mstask)
add_subdirectory(mstask)
add_subdirectory(msvcrt)
#add_subdirectory(msvcrt20) FIX spec2def
#add_subdirectory(msvcrt40) FIX spec2def

16
dll/win32/mstask/CMakeLists.txt
View file

@ -5,28 +5,30 @@ remove_definitions(-DWINVER=0x502)
add_definitions(-DWINVER=0x600)
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D__WINESRC__)
add_definitions(-D_WIN32_WINNT=0x600)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
add_idl_interface(mstask_local.idl)
spec2def(mstask.dll mstask.spec)
add_library(mstask SHARED
list(APPEND SOURCE
factory.c
mstask_main.c
task.c
task_scheduler.c
task_trigger.c
rsrc.rc
${CMAKE_CURRENT_BINARY_DIR}/mstask_local_i.c
${CMAKE_CURRENT_BINARY_DIR}/mstask.def)
add_library(mstask SHARED ${SOURCE})
set_module_type(mstask win32dll)
target_link_libraries(mstask
mstask_local_interface
uuid
wine)
target_link_libraries(mstask uuid wine)
add_importlibs(mstask ole32 ntdll)
add_importlibs(mstask ole32 msvcrt kernel32 ntdll)
add_cab_target(mstask 1)

29
dll/win32/shell32/CMakeLists.txt
View file

@ -1,4 +1,19 @@
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
add_definitions(
-D_SHELL32_
-DCOM_NO_WINDOWS_H
-D_WINE)
include_directories(
${REACTOS_SOURCE_DIR}/include/reactos/wine
${REACTOS_SOURCE_DIR}/lib/recyclebin
${REACTOS_SOURCE_DIR})
add_idl_interface(shobjidl_local.idl)
spec2def(shell32.dll shell32.spec)
list(APPEND SOURCE
@ -56,21 +71,9 @@ list(APPEND SOURCE
shv_item_new.c
folder_options.c
shell32.rc
${CMAKE_CURRENT_BINARY_DIR}/shobjidl_local_i.c
${CMAKE_CURRENT_BINARY_DIR}/shell32.def)
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
add_definitions(
-D_SHELL32_
-DCOM_NO_WINDOWS_H
-D_WINE)
include_directories(
${REACTOS_SOURCE_DIR}/include/reactos/wine
${REACTOS_SOURCE_DIR}/lib/recyclebin
${REACTOS_SOURCE_DIR})
add_pch(shell32 ${CMAKE_CURRENT_SOURCE_DIR}/precomp.h ${SOURCE})
add_library(shell32 SHARED ${CMAKE_CURRENT_BINARY_DIR}/shell32_precomp.h.gch ${SOURCE})