* Make the minimum required version 2.8.
* Remove redundant psdk dependencies.
* Tidy up CMake files.

svn path=/trunk/; revision=64795
This commit is contained in:
Amine Khaldi 2014-10-17 23:28:29 +00:00
parent fd8e3415c8
commit 2bdcf8789d
367 changed files with 284 additions and 1359 deletions

View file

@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 2.8)
if(POLICY CMP0017)
# Shadow cmake provided modules

View file

@ -1,10 +1,8 @@
set_cpp()
add_definitions(-DUSER_MODE)
include_directories(${REACTOS_SOURCE_DIR}/drivers/storage/ide/uniata)
add_executable(atactl atactl.cpp atactl.rc)
set_module_type(atactl win32cui)
add_importlibs(atactl advapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET atactl DESTINATION reactos/system32 FOR all)

View file

@ -1,10 +1,6 @@
add_executable(cmd_help
help.c
help.rc)
add_executable(cmd_help help.c help.rc)
set_module_type(cmd_help win32cui UNICODE)
add_importlibs(cmd_help msvcrt kernel32 user32)
add_importlibs(cmd_help user32 msvcrt kernel32)
set_target_properties(cmd_help PROPERTIES OUTPUT_NAME "help")
add_cd_file(TARGET cmd_help DESTINATION reactos/system32 FOR all)

View file

@ -1,6 +1,5 @@
add_executable(hostname hostname.c hostname.rc)
set_module_type(hostname win32cui UNICODE)
add_importlibs(hostname user32 msvcrt kernel32)
add_cd_file(TARGET hostname DESTINATION reactos/system32 FOR all)

View file

@ -1,7 +1,5 @@
add_executable(lodctr lodctr_main.c)
set_module_type(lodctr win32cui UNICODE)
add_importlibs(lodctr loadperf msvcrt kernel32)
add_cd_file(TARGET lodctr DESTINATION reactos/system32 FOR all)

View file

@ -2,6 +2,5 @@
add_executable(mode mode.c mode.rc)
set_module_type(mode win32cui UNICODE)
set_target_properties(mode PROPERTIES SUFFIX ".com")
add_importlibs(mode user32 msvcrt kernel32)
add_cd_file(TARGET mode DESTINATION reactos/system32 FOR all)

View file

@ -2,6 +2,5 @@
add_executable(more more.c more.rc)
set_module_type(more win32cui)
set_target_properties(more PROPERTIES SUFFIX ".com")
add_importlibs(more user32 msvcrt kernel32)
add_cd_file(TARGET more DESTINATION reactos/system32 FOR all)

View file

@ -1,6 +1,5 @@
set_cpp(WITH_RUNTIME)
include_directories(${REACTOS_SOURCE_DIR}/lib/3rdparty/cardlib)
list(APPEND SOURCE

View file

@ -3,4 +3,5 @@ add_executable(kbswitch kbswitch.c kbswitch.rc)
set_module_type(kbswitch win32gui UNICODE)
add_importlibs(kbswitch advapi32 user32 shell32 gdi32 msvcrt kernel32)
add_cd_file(TARGET kbswitch DESTINATION reactos/system32 FOR all)
add_subdirectory(kbsdll)

View file

@ -1,5 +1,4 @@
spec2def(kbsdll.dll kbsdll.spec)
list(APPEND SOURCE
@ -8,7 +7,6 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/kbsdll.def)
add_library(kbsdll SHARED ${SOURCE})
set_module_type(kbsdll win32dll UNICODE)
add_importlibs(kbsdll user32 comctl32 msvcrt kernel32)
add_cd_file(TARGET kbsdll DESTINATION reactos/system32 FOR all)

View file

@ -2,7 +2,9 @@
add_executable(eventvwr eventvwr.c eventvwr.rc)
set_module_type(eventvwr win32gui UNICODE)
add_importlibs(eventvwr user32 comctl32 comdlg32 advapi32 msvcrt kernel32)
if(MSVC)
add_importlibs(eventvwr ntdll)
endif()
add_cd_file(TARGET eventvwr DESTINATION reactos/system32 FOR all)

View file

@ -1,8 +1,5 @@
add_executable(arp arp.c arp.rc)
set_module_type(arp win32cui)
add_importlibs(arp iphlpapi ws2_32 shlwapi msvcrt kernel32)
add_cd_file(TARGET arp DESTINATION reactos/system32 FOR all)

View file

@ -1,12 +1,9 @@
add_executable(dwnl dwnl.c)
set_module_type(dwnl win32cui UNICODE)
target_link_libraries(dwnl uuid)
add_importlibs(dwnl urlmon wininet msvcrt kernel32)
if(MSVC)
add_importlibs(dwnl ntdll)
endif()

View file

@ -1,8 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/wine)
add_executable(netsh netsh.c)
target_link_libraries(netsh wine)
set_module_type(netsh win32cui UNICODE)

View file

@ -3,7 +3,9 @@ add_definitions(-D__USE_W32_SOCKETS)
add_executable(ping ping.c ping.rc)
set_module_type(ping win32cui UNICODE)
add_importlibs(ping user32 ws2_32 msvcrt kernel32)
if(MSVC)
add_importlibs(ping ntdll)
endif()
add_cd_file(TARGET ping DESTINATION reactos/system32 FOR all)

View file

@ -1,7 +1,5 @@
add_executable(route route.c route.rc)
set_module_type(route win32cui UNICODE)
add_importlibs(route ws2_32 iphlpapi msvcrt kernel32)
add_cd_file(TARGET route DESTINATION reactos/system32 FOR all)

View file

@ -1,13 +1,11 @@
add_definitions(-D__USE_W32_SOCKETS)
add_executable(tracert tracert.c tracert.rc)
set_module_type(tracert win32cui)
add_importlibs(tracert ws2_32 msvcrt kernel32)
if(MSVC)
add_importlibs(tracert ntdll)
add_importlibs(tracert ntdll)
endif()
add_cd_file(TARGET tracert DESTINATION reactos/system32 FOR all)

View file

@ -1,6 +1,5 @@
add_executable(whois whois.c whois.rc)
set_module_type(whois win32cui)
add_importlibs(whois ws2_32 msvcrt kernel32)
add_cd_file(TARGET whois DESTINATION reactos/system32 FOR all)

View file

@ -2,8 +2,8 @@
include_directories(
BEFORE include
${REACTOS_SOURCE_DIR}/include/reactos/drivers/ndisuio)
add_executable(wlanconf wlanconf.c wlanconf.rc)
add_executable(wlanconf wlanconf.c wlanconf.rc)
set_module_type(wlanconf win32cui UNICODE)
add_importlibs(wlanconf msvcrt user32 iphlpapi kernel32)
add_cd_file(TARGET wlanconf DESTINATION reactos/system32 FOR all)

View file

@ -1,5 +1,5 @@
add_executable(setup16 main.c)
set_module_type(setup16 win32gui UNICODE)
add_importlibs(setup16 user32 gdi32 advapi32 msvcrt kernel32 shell32 setupapi)
add_importlibs(setup16 user32 gdi32 advapi32 shell32 setupapi msvcrt kernel32)
add_cd_file(TARGET setup16 DESTINATION reactos/system32 FOR all)

View file

@ -7,6 +7,6 @@ list(APPEND SOURCE
add_executable(shutdown ${SOURCE} shutdown.rc)
set_module_type(shutdown win32cui UNICODE)
add_importlibs(shutdown advapi32 user32 msvcrt powrprof kernel32)
add_importlibs(shutdown advapi32 user32 powrprof msvcrt kernel32)
add_pch(shutdown precomp.h SOURCE)
add_cd_file(TARGET shutdown DESTINATION reactos/system32 FOR all)

View file

@ -14,6 +14,6 @@ list(APPEND SOURCE
add_executable(sndrec32 ${SOURCE} rsrc.rc)
set_module_type(sndrec32 win32gui UNICODE)
add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 msvcrt kernel32 shell32)
add_importlibs(sndrec32 winmm user32 msacm32 comctl32 comdlg32 gdi32 shell32 msvcrt kernel32)
add_pch(sndrec32 stdafx.h SOURCE)
add_cd_file(TARGET sndrec32 DESTINATION reactos/system32 FOR all)

View file

@ -2,7 +2,6 @@
remove_definitions(-D_WIN32_IE=0x600)
add_definitions(-D__ROS_LONG64__)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
list(APPEND SOURCE
@ -13,7 +12,6 @@ list(APPEND SOURCE
rsrc.rc)
add_executable(wordpad ${SOURCE})
set_module_type(wordpad win32gui)
target_link_libraries(wordpad wine uuid)
add_importlibs(wordpad comdlg32 ole32 shell32 user32 gdi32 advapi32 comctl32 msvcrt kernel32 ntdll)

View file

@ -14,15 +14,9 @@ list(APPEND SOURCE
${CMAKE_CURRENT_BINARY_DIR}/irot_s.c)
include_directories(${REACTOS_BINARY_DIR}/include/reactos/wine)
add_executable(rpcss ${SOURCE} rpcss.rc)
target_link_libraries(rpcss
${PSEH_LIB}
wine)
target_link_libraries(rpcss ${PSEH_LIB} wine)
set_module_type(rpcss win32cui UNICODE)
add_importlibs(rpcss advapi32 rpcrt4 msvcrt kernel32 ntdll)
add_pch(rpcss rpcss.h SOURCE)
add_cd_file(TARGET rpcss DESTINATION reactos/system32 FOR all)

View file

@ -1,9 +1,6 @@
add_executable(spoolsv spoolsv.c spoolsv.rc)
target_link_libraries(spoolsv wine)
set_module_type(spoolsv win32cui UNICODE)
add_importlibs(spoolsv advapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET spoolsv DESTINATION reactos/system32 FOR all)

View file

@ -5,7 +5,6 @@ add_executable(telnetd
telnetd.rc)
target_link_libraries(telnetd wine)
set_module_type(telnetd win32cui)
add_importlibs(telnetd advapi32 ws2_32 msvcrt kernel32 ntdll)
add_cd_file(TARGET telnetd DESTINATION reactos/system32 FOR all)

View file

@ -1,8 +1,6 @@
add_executable(thmsvc thmsvc.c thmsvc.rc)
target_link_libraries(thmsvc wine)
set_module_type(thmsvc win32cui UNICODE)
add_importlibs(thmsvc uxtheme advapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET thmsvc DESTINATION reactos/system32 FOR all)

View file

@ -1,8 +1,6 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl)
add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/pnp.idl)
spec2def(umpnpmgr.dll umpnpmgr.spec ADD_IMPORTLIB)
add_library(umpnpmgr SHARED
@ -12,10 +10,7 @@ add_library(umpnpmgr SHARED
${CMAKE_CURRENT_BINARY_DIR}/umpnpmgr_stubs.c
${CMAKE_CURRENT_BINARY_DIR}/umpnpmgr.def)
target_link_libraries(umpnpmgr
wdmguid
${PSEH_LIB})
target_link_libraries(umpnpmgr wdmguid ${PSEH_LIB})
set_module_type(umpnpmgr win32dll UNICODE)
add_importlibs(umpnpmgr advapi32 rpcrt4 userenv shlwapi msvcrt kernel32 ntdll)
add_cd_file(TARGET umpnpmgr DESTINATION reactos/system32 FOR all)

View file

@ -1,6 +1,5 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/idl)
add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/wlansvc.idl)
list(APPEND SOURCE

View file

@ -1,7 +1,5 @@
add_executable(setup setup.c setup.rc)
set_module_type(setup win32gui UNICODE)
add_importlibs(setup userenv msvcrt kernel32 ntdll)
add_cd_file(TARGET setup DESTINATION reactos/system32 FOR all)

View file

@ -1,5 +1,6 @@
add_definitions(${I18N_DEFS})
include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${REACTOS_SOURCE_DIR}/lib/inflib

View file

@ -19,20 +19,6 @@ list(APPEND SOURCE
add_executable(explorer_new ${SOURCE} explorer.rc)
target_link_libraries(explorer_new uuid)
set_module_type(explorer_new win32gui UNICODE)
add_importlibs(explorer_new
advapi32
gdi32
user32
comctl32
ole32
oleaut32
shell32
shlwapi
shdocvw
version
uxtheme
msvcrt
kernel32
ntdll)
add_importlibs(explorer_new advapi32 gdi32 user32 comctl32 ole32 oleaut32 shell32 shlwapi shdocvw version uxtheme msvcrt kernel32 ntdll)
add_pch(explorer_new precomp.h SOURCE)
add_cd_file(TARGET explorer_new DESTINATION reactos FOR all)

View file

@ -54,7 +54,6 @@ add_executable(explorer
target_link_libraries(explorer comsupp wine uuid)
set_module_type(explorer win32gui UNICODE)
add_importlibs(explorer advapi32 gdi32 user32 ws2_32 msimg32 comctl32 ole32 oleaut32 shell32 shlwapi notifyhook msvcrt kernel32 ntdll)
add_pch(explorer precomp.h SOURCE)
add_dependencies(explorer psdk)

View file

@ -1,8 +1,6 @@
add_executable(autochk WIN32 autochk.c autochk.rc)
set_module_type(autochk nativecui)
target_link_libraries(autochk nt)
add_importlibs(autochk ntdll)
add_cd_file(TARGET autochk DESTINATION reactos/system32 FOR all)

View file

@ -1,7 +1,5 @@
add_executable(bootok bootok.c bootok.rc)
set_module_type(bootok win32cui UNICODE)
add_importlibs(bootok advapi32 msvcrt kernel32 ntdll)
add_cd_file(TARGET bootok DESTINATION reactos/system32 FOR all)

View file

@ -42,9 +42,11 @@ list(APPEND SOURCE
add_executable(diskpart ${SOURCE} diskpart.rc)
set_module_type(diskpart win32cui UNICODE)
add_importlibs(diskpart user32 msvcrt advapi32 kernel32)
add_importlibs(diskpart user32 advapi32 msvcrt kernel32)
if(MSVC)
add_importlibs(diskpart ntdll)
add_importlibs(diskpart ntdll)
endif()
add_pch(diskpart diskpart.h SOURCE)
add_cd_file(TARGET diskpart DESTINATION reactos/system32 FOR all)

View file

@ -1,8 +1,6 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
add_executable(expand expand.c expand.rc)
set_module_type(expand win32cui)
add_importlibs(expand lz32 setupapi user32 msvcrt kernel32 ntdll)
add_cd_file(TARGET expand DESTINATION reactos/system32 FOR all)

View file

@ -2,6 +2,5 @@
add_executable(format format.c format.rc)
set_module_type(format win32cui)
set_target_properties(format PROPERTIES SUFFIX ".com")
add_importlibs(format user32 fmifs msvcrt kernel32 ntdll)
add_cd_file(TARGET format DESTINATION reactos/system32 FOR all)

View file

@ -1,9 +1,6 @@
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/subsys)
add_executable(lsass lsass.c lsass.rc)
set_module_type(lsass win32gui UNICODE)
add_importlibs(lsass advapi32 lsasrv samsrv msvcrt kernel32 ntdll)
add_cd_file(TARGET lsass DESTINATION reactos/system32 FOR all)

View file

@ -1,6 +1,5 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/wine)
list(APPEND SOURCE
@ -9,7 +8,6 @@ list(APPEND SOURCE
precomp.h)
add_executable(msiexec ${SOURCE} rsrc.rc)
set_module_type(msiexec win32gui)
target_link_libraries(msiexec uuid wine)
add_importlibs(msiexec user32 advapi32 ole32 msi msvcrt kernel32 ntdll)

View file

@ -1,3 +1,4 @@
add_executable(rundll32 rundll32.c rundll32.rc)
set_module_type(rundll32 win32gui UNICODE)
add_importlibs(rundll32 user32 msvcrt kernel32 ntdll)

View file

@ -6,7 +6,6 @@ include_directories(
add_rpc_files(server ${REACTOS_SOURCE_DIR}/include/reactos/idl/svcctl.idl)
list(APPEND SOURCE
config.c
controlset.c

View file

@ -28,8 +28,7 @@ add_custom_command(
${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.maydiff
${CMAKE_CURRENT_BINARY_DIR}/reactos.dff
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/reactos.dff.in
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn
)
DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/reactos.dff.dyn)
add_custom_target(
reactos_cab_inf
@ -41,4 +40,3 @@ add_cd_file(
FILE ${CMAKE_CURRENT_BINARY_DIR}/reactos.inf
DESTINATION reactos
NO_CAB FOR bootcd regtest)

View file

@ -1,19 +1,18 @@
if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64")
CreateBootSectorTarget(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/dosmbr.S ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin 7c00)
CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.S ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0)
CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.S ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00)
CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/fatx.S ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 7c00)
CreateBootSectorTarget(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/isoboot.S ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin 7000)
CreateBootSectorTarget(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.S ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin 7000)
CreateBootSectorTarget(dosmbr ${CMAKE_CURRENT_SOURCE_DIR}/dosmbr.S ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin 7c00)
CreateBootSectorTarget(ext2 ${CMAKE_CURRENT_SOURCE_DIR}/ext2.S ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin 0)
CreateBootSectorTarget(fat32 ${CMAKE_CURRENT_SOURCE_DIR}/fat32.S ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin 7c00)
CreateBootSectorTarget(fat ${CMAKE_CURRENT_SOURCE_DIR}/fatx.S ${CMAKE_CURRENT_BINARY_DIR}/fat.bin 7c00)
CreateBootSectorTarget(isoboot ${CMAKE_CURRENT_SOURCE_DIR}/isoboot.S ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin 7000)
CreateBootSectorTarget(isobtrt ${CMAKE_CURRENT_SOURCE_DIR}/isobtrt.S ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin 7000)
add_cd_file(TARGET dosmbr DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin FOR all)
add_cd_file(TARGET fat32 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin FOR all)
add_cd_file(TARGET fat DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat.bin FOR all)
add_cd_file(TARGET isoboot DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin FOR all)
add_cd_file(TARGET isobtrt DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin FOR all)
add_cd_file(TARGET ext2 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin FOR all)
add_cd_file(TARGET dosmbr DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/dosmbr.bin FOR all)
add_cd_file(TARGET fat32 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat32.bin FOR all)
add_cd_file(TARGET fat DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/fat.bin FOR all)
add_cd_file(TARGET isoboot DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/isoboot.bin FOR all)
add_cd_file(TARGET isobtrt DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/isobtrt.bin FOR all)
add_cd_file(TARGET ext2 DESTINATION loader NO_CAB FILE ${CMAKE_CURRENT_BINARY_DIR}/ext2.bin FOR all)
endif()

View file

@ -210,7 +210,7 @@ endif()
target_link_libraries(freeldr_pe freeldr_common cportlib cmlib rtl libcntpr)
target_link_libraries(freeldr_pe_dbg freeldr_common cportlib cmlib rtl libcntpr)
if (STACK_PROTECTOR)
if(STACK_PROTECTOR)
target_link_libraries(freeldr_pe gcc_ssp)
target_link_libraries(freeldr_pe_dbg gcc_ssp)
endif()
@ -229,8 +229,7 @@ add_custom_target(freeldr ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys)
add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB FOR bootcd regtest)
add_cd_file(TARGET freeldr FILE ${CMAKE_CURRENT_BINARY_DIR}/freeldr.sys DESTINATION loader NO_CAB FOR livecd NAME_ON_CD setupldr.sys)
list(APPEND SETUPLDR_SOURCE
inffile/inffile.c)
list(APPEND SETUPLDR_SOURCE inffile/inffile.c)
if(ARCH STREQUAL "i386" OR ARCH STREQUAL "amd64")
list(APPEND SETUPLDR_SOURCE windows/setupldr.c)
@ -271,7 +270,7 @@ endif()
target_link_libraries(setupldr_pe freeldr_common cportlib cmlib rtl libcntpr)
target_link_libraries(setupldr_pe_dbg freeldr_common cportlib cmlib rtl libcntpr)
if (STACK_PROTECTOR)
if(STACK_PROTECTOR)
target_link_libraries(setupldr_pe gcc_ssp)
target_link_libraries(setupldr_pe_dbg gcc_ssp)
endif()

View file

@ -4,5 +4,4 @@ add_executable(installfreeldr EXCLUDE_FROM_ALL
volume.c)
set_module_type(installfreeldr win32cui)
add_importlibs(installfreeldr msvcrt kernel32)

View file

@ -9,9 +9,5 @@ add_library(dxtn SHARED
${CMAKE_CURRENT_BINARY_DIR}/dxtn.def)
set_entrypoint(dxtn 0)
add_importlibs(dxtn msvcrt)
add_dependencies(dxtn psdk)
add_cd_file(TARGET dxtn DESTINATION reactos/system32 FOR all)

View file

@ -60,5 +60,4 @@ add_library(libjpeg SHARED
set_module_type(libjpeg win32dll)
add_importlibs(libjpeg msvcrt kernel32)
add_dependencies(libjpeg psdk)
add_cd_file(TARGET libjpeg DESTINATION reactos/system32 FOR all)

View file

@ -55,7 +55,6 @@ add_library(libtiff SHARED ${SOURCE})
set_module_type(libtiff win32dll)
target_link_libraries(libtiff zlib getopt)
add_importlibs(libtiff user32 msvcrt kernel32 ntdll)
add_dependencies(libtiff psdk)
add_pch(libtiff precomp.h SOURCE)
add_cd_file(TARGET libtiff DESTINATION reactos/system32 FOR all)

View file

@ -39,11 +39,11 @@ add_library(libxslt SHARED ${SOURCE})
set_module_type(libxslt win32dll)
target_link_libraries(libxslt libxml2 iconv-static zlib)
add_importlibs(libxslt msvcrt ws2_32 kernel32)
if(MSVC)
add_importlibs(libxslt ntdll)
endif()
add_dependencies(libxslt psdk)
add_pch(libxslt precomp.h SOURCE)
add_cd_file(TARGET libxslt DESTINATION reactos/system32 FOR all)

View file

@ -1,11 +1,9 @@
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
remove_definitions(-D_WIN32_WINNT=0x502)
add_definitions(-D_WIN32_WINNT=0x600)
add_definitions(-D__WINESRC__)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(appwiz.cpl appwiz.spec)
list(APPEND SOURCE

View file

@ -20,14 +20,6 @@ add_library(console SHARED
set_module_type(console cpl UNICODE)
set_target_properties(console PROPERTIES SUFFIX ".dll")
add_importlibs(console
msvcrt
user32
gdi32
comctl32
kernel32
ntdll)
add_importlibs(console user32 gdi32 comctl32 msvcrt kernel32 ntdll)
add_pch(console console.h SOURCE)
add_cd_file(TARGET console DESTINATION reactos/system32 FOR all)

View file

@ -30,21 +30,6 @@ add_library(desk SHARED
set_module_type(desk cpl UNICODE)
target_link_libraries(desk uuid)
add_importlibs(desk
msvcrt
user32
advapi32
gdi32
comctl32
comdlg32
ole32
setupapi
shell32
shlwapi
uxtheme
kernel32
ntdll)
add_importlibs(desk user32 advapi32 gdi32 comctl32 comdlg32 ole32 setupapi shell32 shlwapi uxtheme msvcrt kernel32 ntdll)
add_pch(desk desk.h SOURCE)
add_cd_file(TARGET desk DESTINATION reactos/system32 FOR all)

View file

@ -1,18 +1,11 @@
spec2def(hdwwiz.cpl hdwwiz.spec)
add_library(hdwwiz SHARED hdwwiz.c hdwwiz.rc ${CMAKE_CURRENT_BINARY_DIR}/hdwwiz.def)
add_library(hdwwiz SHARED
hdwwiz.c
hdwwiz.rc
${CMAKE_CURRENT_BINARY_DIR}/hdwwiz.def)
set_module_type(hdwwiz cpl UNICODE)
add_importlibs(hdwwiz
msvcrt
setupapi
advapi32
comctl32
rpcrt4
user32
gdi32
devmgr
kernel32
ntdll)
add_importlibs(hdwwiz setupapi advapi32 comctl32 rpcrt4 user32 gdi32 devmgr msvcrt kernel32 ntdll)
add_cd_file(TARGET hdwwiz DESTINATION reactos/system32 FOR all)

View file

@ -1,25 +1,15 @@
spec2def(hotplug.dll hotplug.spec)
list(APPEND SOURCE
hotplug.c
enum.c
enum.c)
add_library(hotplug SHARED
${SOURCE}
hotplug.rc
${CMAKE_CURRENT_BINARY_DIR}/hotplug.def)
add_library(hotplug SHARED ${SOURCE})
set_module_type(hotplug win32dll UNICODE)
add_importlibs(hotplug
msvcrt
user32
gdi32
advapi32
ntdll
setupapi
comctl32
kernel32)
add_importlibs(hotplug user32 gdi32 advapi32 setupapi comctl32 msvcrt kernel32 ntdll)
add_cd_file(TARGET hotplug DESTINATION reactos/system32 FOR all)

View file

@ -16,14 +16,6 @@ add_library(input SHARED
${CMAKE_CURRENT_BINARY_DIR}/input.def)
set_module_type(input win32dll UNICODE)
add_importlibs(input
msvcrt
advapi32
user32
comctl32
gdi32
kernel32)
add_importlibs(input advapi32 user32 comctl32 gdi32 msvcrt kernel32)
add_pch(input input.h SOURCE)
add_cd_file(TARGET input DESTINATION reactos/system32 FOR all)

View file

@ -22,16 +22,6 @@ add_library(intl SHARED
${CMAKE_CURRENT_BINARY_DIR}/intl.def)
set_module_type(intl cpl UNICODE)
add_importlibs(intl
msvcrt
user32
comctl32
advapi32
setupapi
shell32
kernel32
ntdll)
add_importlibs(intl user32 comctl32 advapi32 setupapi shell32 msvcrt kernel32 ntdll)
add_pch(intl intl.h SOURCE)
add_cd_file(TARGET intl DESTINATION reactos/system32 FOR all)

View file

@ -1,16 +1,12 @@
spec2def(joy.cpl joy.spec)
add_library(joy SHARED joy.c joy.rc ${CMAKE_CURRENT_BINARY_DIR}/joy.def)
add_library(joy SHARED
joy.c
joy.rc
${CMAKE_CURRENT_BINARY_DIR}/joy.def)
set_module_type(joy cpl UNICODE)
target_link_libraries(joy uuid)
add_importlibs(joy
user32
comctl32
ole32
shell32
msvcrt
kernel32
ntdll)
add_importlibs(joy user32 comctl32 ole32 shell32 msvcrt kernel32 ntdll)
add_cd_file(TARGET joy DESTINATION reactos/system32 FOR all)

View file

@ -14,17 +14,6 @@ add_library(main SHARED
set_module_type(main cpl UNICODE)
target_link_libraries(main uuid)
add_importlibs(main
msvcrt
advapi32
user32
comctl32
devmgr
comdlg32
shell32
gdi32
kernel32)
add_importlibs(main advapi32 user32 comctl32 devmgr comdlg32 shell32 gdi32 msvcrt kernel32)
add_pch(main main.h SOURCE)
add_cd_file(TARGET main DESTINATION reactos/system32 FOR all)

View file

@ -15,21 +15,6 @@ add_library(mmsys SHARED
${CMAKE_CURRENT_BINARY_DIR}/mmsys.def)
set_module_type(mmsys cpl UNICODE)
add_importlibs(mmsys
msvcrt
user32
comctl32
devmgr
gdi32
winmm
advapi32
shell32
setupapi
shlwapi
ntdll
kernel32
comdlg32)
add_importlibs(mmsys user32 comctl32 devmgr gdi32 winmm advapi32 shell32 setupapi shlwapi comdlg32 msvcrt kernel32 ntdll)
add_pch(mmsys mmsys.h SOURCE)
add_cd_file(TARGET mmsys DESTINATION reactos/system32 FOR all)

View file

@ -1,15 +1,10 @@
spec2def(ncpa.cpl ncpa.spec)
add_library(ncpa SHARED ncpa.c ${CMAKE_CURRENT_BINARY_DIR}/ncpa.def)
add_library(ncpa SHARED
ncpa.c
${CMAKE_CURRENT_BINARY_DIR}/ncpa.def)
set_module_type(ncpa cpl UNICODE)
add_importlibs(ncpa
msvcrt
advapi32
shell32
kernel32)
add_importlibs(ncpa advapi32 shell32 msvcrt kernel32)
add_cd_file(TARGET ncpa DESTINATION reactos/system32 FOR all)

View file

@ -1,5 +1,4 @@
spec2def(odbccp32i.cpl odbccp32.spec)
add_library(odbccp32i SHARED
@ -8,6 +7,5 @@ add_library(odbccp32i SHARED
${CMAKE_CURRENT_BINARY_DIR}/odbccp32i.def)
set_module_type(odbccp32i cpl UNICODE)
add_importlibs(odbccp32i user32 comctl32 msvcrt kernel32)
add_cd_file(TARGET odbccp32i DESTINATION reactos/system32 FOR all)

View file

@ -15,16 +15,6 @@ add_library(powercfg SHARED
${CMAKE_CURRENT_BINARY_DIR}/powercfg.def)
set_module_type(powercfg cpl UNICODE)
add_importlibs(powercfg
msvcrt
user32
powrprof
comctl32
shell32
advapi32
kernel32
ntdll)
add_importlibs(powercfg user32 powrprof comctl32 shell32 advapi32 msvcrt kernel32 ntdll)
add_pch(powercfg powercfg.h SOURCE)
add_cd_file(TARGET powercfg DESTINATION reactos/system32 FOR all)

View file

@ -20,21 +20,6 @@ add_library(sysdm SHARED
${CMAKE_CURRENT_BINARY_DIR}/sysdm.def)
set_module_type(sysdm cpl UNICODE)
add_importlibs(sysdm
msvcrt
advapi32
setupapi
user32
gdi32
comctl32
msimg32
shell32
shlwapi
ole32
powrprof
kernel32
ntdll)
add_importlibs(sysdm advapi32 setupapi user32 gdi32 comctl32 msimg32 shell32 shlwapi ole32 powrprof msvcrt kernel32 ntdll)
add_pch(sysdm precomp.h SOURCE)
add_cd_file(TARGET sysdm DESTINATION reactos/system32 FOR all)

View file

@ -1,16 +1,12 @@
spec2def(telephon.cpl telephon.spec)
add_library(telephon SHARED telephon.c telephon.rc ${CMAKE_CURRENT_BINARY_DIR}/telephon.def)
add_library(telephon SHARED
telephon.c
telephon.rc
${CMAKE_CURRENT_BINARY_DIR}/telephon.def)
set_module_type(telephon cpl UNICODE)
target_link_libraries(telephon uuid)
add_importlibs(telephon
advapi32
user32
comctl32
ole32
shell32
msvcrt
kernel32)
add_importlibs(telephon advapi32 user32 comctl32 ole32 shell32 msvcrt kernel32)
add_cd_file(TARGET telephon DESTINATION reactos/system32 FOR all)

View file

@ -17,16 +17,6 @@ add_library(timedate SHARED
${CMAKE_CURRENT_BINARY_DIR}/timedate.def)
set_module_type(timedate cpl UNICODE)
add_importlibs(timedate
advapi32
user32
gdi32
comctl32
ws2_32
iphlpapi
msvcrt
kernel32)
add_importlibs(timedate advapi32 user32 gdi32 comctl32 ws2_32 iphlpapi msvcrt kernel32)
add_pch(timedate timedate.h SOURCE)
add_cd_file(TARGET timedate DESTINATION reactos/system32 FOR all)

View file

@ -1,6 +1,5 @@
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(usrmgr.cpl usrmgr.spec)
list(APPEND SOURCE
@ -19,16 +18,6 @@ add_library(usrmgr SHARED
${CMAKE_CURRENT_BINARY_DIR}/usrmgr.def)
set_module_type(usrmgr cpl UNICODE)
add_importlibs(usrmgr
advapi32
user32
gdi32
comctl32
netapi32
msvcrt
kernel32
ntdll)
add_importlibs(usrmgr advapi32 user32 gdi32 comctl32 netapi32 msvcrt kernel32 ntdll)
add_pch(usrmgr usrmgr.h SOURCE)
add_cd_file(TARGET usrmgr DESTINATION reactos/system32 FOR all)

View file

@ -12,13 +12,6 @@ add_library(wined3dcfg SHARED
${CMAKE_CURRENT_BINARY_DIR}/wined3dcfg.def)
set_module_type(wined3dcfg cpl UNICODE)
add_importlibs(wined3dcfg
msvcrt
user32
comctl32
advapi32
kernel32)
add_importlibs(wined3dcfg user32 comctl32 advapi32 msvcrt kernel32)
add_pch(wined3dcfg wined3dcfg.h SOURCE)
add_cd_file(TARGET wined3dcfg DESTINATION reactos/system32 FOR all)

View file

@ -1,6 +1,10 @@
spec2def(d3d8thk.dll d3d8thk.spec)
add_library(d3d8thk SHARED d3d8thk.rc ${CMAKE_CURRENT_BINARY_DIR}/d3d8thk.def)
add_library(d3d8thk SHARED
d3d8thk.rc
${CMAKE_CURRENT_BINARY_DIR}/d3d8thk.def)
set_entrypoint(d3d8thk 0)
add_importlibs(d3d8thk gdi32)
add_dependencies(d3d8thk psdk)

View file

@ -2,60 +2,45 @@
spec2def(ddraw.dll ddraw.spec ADD_IMPORTLIB)
list(APPEND SOURCE
cleanup.c
main.c
startup.c
Clipper/clipper_main.c
Clipper/clipper_stubs.c
Color/color_stubs.c
d3d/DirectD3D_main.c
Ddraw/callbacks_dd_hel.c
Ddraw/ddraw_displaymode.c
Ddraw/ddraw_main.c
Ddraw/ddraw_setcooperativelevel.c
Ddraw/ddraw_stubs.c
Ddraw/GetCaps.c
Ddraw/GetDeviceIdentifier.c
Gamma/gamma_stubs.c
Kernel/kernel_stubs.c
Palette/createpalette.c
Palette/palette.c
Surface/callbacks_surf_hel.c
Surface/createsurface.c
Surface/surface_main.c
Surface/surface_stubs.c
Videoport/videoport_stubs.c
Vtable/DirectD3D_Vtable.c
Vtable/DirectD3D2_Vtable.c
Vtable/DirectD3D3_Vtable.c
Vtable/DirectD3D7_Vtable.c
Vtable/DirectDraw_Vtable.c
Vtable/DirectDraw2_Vtable.c
Vtable/DirectDraw4_Vtable.c
Vtable/DirectDraw7_Vtable.c
Vtable/DirectDrawSurface_Vtable.c
Vtable/DirectDrawSurface2_Vtable.c
Vtable/DirectDrawSurface3_Vtable.c
Vtable/DirectDrawSurface4_Vtable.c
Vtable/DirectDrawSurface7_Vtable.c
)
cleanup.c
main.c
startup.c
Clipper/clipper_main.c
Clipper/clipper_stubs.c
Color/color_stubs.c
d3d/DirectD3D_main.c
Ddraw/callbacks_dd_hel.c
Ddraw/ddraw_displaymode.c
Ddraw/ddraw_main.c
Ddraw/ddraw_setcooperativelevel.c
Ddraw/ddraw_stubs.c
Ddraw/GetCaps.c
Ddraw/GetDeviceIdentifier.c
Gamma/gamma_stubs.c
Kernel/kernel_stubs.c
Palette/createpalette.c
Palette/palette.c
Surface/callbacks_surf_hel.c
Surface/createsurface.c
Surface/surface_main.c
Surface/surface_stubs.c
Videoport/videoport_stubs.c
Vtable/DirectD3D_Vtable.c
Vtable/DirectD3D2_Vtable.c
Vtable/DirectD3D3_Vtable.c
Vtable/DirectD3D7_Vtable.c
Vtable/DirectDraw_Vtable.c
Vtable/DirectDraw2_Vtable.c
Vtable/DirectDraw4_Vtable.c
Vtable/DirectDraw7_Vtable.c
Vtable/DirectDrawSurface_Vtable.c
Vtable/DirectDrawSurface2_Vtable.c
Vtable/DirectDrawSurface3_Vtable.c
Vtable/DirectDrawSurface4_Vtable.c
Vtable/DirectDrawSurface7_Vtable.c)
add_library(ddraw SHARED ${SOURCE})
set_module_type(ddraw win32dll)
target_link_libraries(ddraw
uuid
dxguid
${PSEH_LIB}
)
add_importlibs(ddraw
advapi32
gdi32
user32
msvcrt
kernel32
ntdll)
add_cd_file(TARGET ddraw DESTINATION reactos/system32 FOR all)
target_link_libraries(ddraw uuid dxguid ${PSEH_LIB})
add_importlibs(ddraw advapi32 gdi32 user32 msvcrt kernel32 ntdll)
add_cd_file(TARGET ddraw DESTINATION reactos/system32 FOR all)

View file

@ -1,6 +1,5 @@
set_cpp(WITH_STL)
spec2def(ksproxy.ax ksproxy.spec)
list(APPEND SOURCE
@ -26,7 +25,6 @@ list(APPEND SOURCE
add_library(ksproxy SHARED ${SOURCE} ksproxy.rc)
set_module_type(ksproxy win32dll)
set_target_properties(ksproxy PROPERTIES SUFFIX ".ax")
target_link_libraries(ksproxy strmiids)
add_importlibs(ksproxy advapi32 ole32 setupapi ksuser msvcrt kernel32 ntdll)
add_dependencies(ksproxy dxsdk)

View file

@ -1,11 +1,12 @@
spec2def(ksuser.dll ksuser.spec ADD_IMPORTLIB)
add_library(ksuser SHARED ksuser.c ksuser.rc ${CMAKE_CURRENT_BINARY_DIR}/ksuser.def)
add_library(ksuser SHARED
ksuser.c
ksuser.rc
${CMAKE_CURRENT_BINARY_DIR}/ksuser.def)
set_module_type(ksuser win32dll)
add_importlibs(ksuser advapi32 msvcrt kernel32 ntdll)
add_dependencies(ksuser psdk bugcodes)
add_dependencies(ksuser bugcodes)
add_cd_file(TARGET ksuser DESTINATION reactos/system32 FOR all)

View file

@ -4,7 +4,6 @@ add_definitions(
-DUSE_WIN32_OPENGL)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3d8.dll d3d8.spec)
list(APPEND SOURCE

View file

@ -4,7 +4,6 @@ add_definitions(
-DUSE_WIN32_OPENGL)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3d9.dll d3d9.spec ADD_IMPORTLIB)
list(APPEND SOURCE

View file

@ -4,7 +4,6 @@ add_definitions(
-DDIRECT3D_VERSION=0x0900)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dcompiler_43.dll d3dcompiler_43.spec ADD_IMPORTLIB)
list(APPEND SOURCE

View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dx9_24.dll d3dx9_24.spec)
list(APPEND SOURCE

View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dx9_25.dll d3dx9_25.spec)
list(APPEND SOURCE

View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dx9_26.dll d3dx9_26.spec)
list(APPEND SOURCE

View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dx9_27.dll d3dx9_27.spec)
list(APPEND SOURCE

View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dx9_28.dll d3dx9_28.spec)
list(APPEND SOURCE

View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dx9_29.dll d3dx9_29.spec)
list(APPEND SOURCE

View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dx9_30.dll d3dx9_30.spec ADD_IMPORTLIB)
list(APPEND SOURCE

View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dx9_31.dll d3dx9_31.spec)
list(APPEND SOURCE

View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dx9_32.dll d3dx9_32.spec)
list(APPEND SOURCE

View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dx9_33.dll d3dx9_33.spec)
list(APPEND SOURCE

View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dx9_34.dll d3dx9_34.spec)
list(APPEND SOURCE

View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dx9_35.dll d3dx9_35.spec)
list(APPEND SOURCE

View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dx9_36.dll d3dx9_36.spec ADD_IMPORTLIB)
list(APPEND SOURCE

View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dx9_37.dll d3dx9_37.spec)
list(APPEND SOURCE

View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dx9_38.dll d3dx9_38.spec)
list(APPEND SOURCE

View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dx9_39.dll d3dx9_39.spec)
list(APPEND SOURCE

View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dx9_40.dll d3dx9_40.spec)
list(APPEND SOURCE

View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dx9_41.dll d3dx9_41.spec)
list(APPEND SOURCE

View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dx9_42.dll d3dx9_42.spec)
list(APPEND SOURCE

View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dx9_43.dll d3dx9_43.spec)
list(APPEND SOURCE

View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(d3dxof.dll d3dxof.spec ADD_IMPORTLIB)
list(APPEND SOURCE

View file

@ -4,7 +4,6 @@ add_definitions(
-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(dplayx.dll dplayx.spec ADD_IMPORTLIB)
list(APPEND SOURCE

View file

@ -5,7 +5,6 @@ add_definitions(
-D__WINESRC__)
include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(dsound.dll dsound.spec ADD_IMPORTLIB)
add_library(dsound SHARED

View file

@ -1,7 +1,6 @@
add_definitions(-D__WINESRC__)
include_directories(BEFORE ${REACTOS_SOURCE_DIR}/include/reactos/wine)
spec2def(dxgi.dll dxgi.spec ADD_IMPORTLIB)
list(APPEND SOURCE

View file

@ -42,7 +42,6 @@ add_library(quartz SHARED
version.rc)
add_idl_headers(quartz_idlheader fil_data.idl)
add_typelib(control_tlb.idl)
list(APPEND quartz_rc_deps
@ -51,7 +50,6 @@ list(APPEND quartz_rc_deps
${CMAKE_CURRENT_SOURCE_DIR}/quartz_strmif.rgs)
set_source_files_properties(version.rc PROPERTIES OBJECT_DEPENDS "${quartz_rc_deps}")
set_module_type(quartz win32dll)
target_link_libraries(quartz strmbase strmiids uuid dxguid wine ${PSEH_LIB})
add_importlibs(quartz dsound msacm32 msvfw32 ole32 oleaut32 shlwapi rpcrt4 user32 gdi32 advapi32 msvcrt kernel32 ntdll)

Some files were not shown because too many files have changed in this diff Show more