mirror of
https://github.com/reactos/reactos.git
synced 2024-08-03 01:50:57 +00:00
[CMAKE]
- Link libxslt to ntdll for MSVC - Don't compile some directx stuff with MSVC atm - Add importlib target for dinput - add importlib target for wined3d and use autogenerated def - Improve quartz svn path=/branches/cmake-bringup/; revision=49833
This commit is contained in:
parent
da553e4658
commit
f5cd0290d4
3
dll/3rdparty/libxslt/CMakeLists.txt
vendored
3
dll/3rdparty/libxslt/CMakeLists.txt
vendored
|
@ -37,6 +37,9 @@ set_entrypoint(libxslt 0)
|
|||
target_link_libraries(libxslt libxml2)
|
||||
|
||||
add_importlibs(libxslt msvcrt ws2_32 kernel32)
|
||||
if(MSVC)
|
||||
add_importlibs(libxslt ntdll)
|
||||
endif()
|
||||
|
||||
add_dependencies(libxslt psdk buildno_header)
|
||||
|
||||
|
|
|
@ -1,8 +1,10 @@
|
|||
|
||||
if (NOT MSVC)
|
||||
add_subdirectory(amstream)
|
||||
add_subdirectory(d3d8thk)
|
||||
endif()
|
||||
#add_subdirectory(bdaplgin) #disabled in trunk
|
||||
#add_subdirectory(d3d8) #disabled in trunk
|
||||
add_subdirectory(d3d8thk)
|
||||
#add_subdirectory(d3d9) #disabled in trunk
|
||||
#add_subdirectory(ddraw) #disabled in trunk
|
||||
add_subdirectory(devenum)
|
||||
|
|
|
@ -38,3 +38,4 @@ add_importlibs(dinput
|
|||
|
||||
|
||||
add_cab_target(dinput 1)
|
||||
add_importlib_target(dinput.spec)
|
||||
|
|
|
@ -46,7 +46,6 @@ add_library(quartz SHARED
|
|||
set_module_type(quartz win32dll)
|
||||
|
||||
target_link_libraries(quartz
|
||||
${CMAKE_CURRENT_BINARY_DIR}/quartz.def
|
||||
quartz_proxy
|
||||
strmiids
|
||||
uuid
|
||||
|
|
|
@ -38,7 +38,7 @@ list(APPEND SOURCE
|
|||
volumetexture.c
|
||||
wined3d_main.c
|
||||
version.rc
|
||||
wined3d.def)
|
||||
${CMAKE_CURRENT_BINARY_DIR}/wined3d.def)
|
||||
|
||||
if(ARCH MATCHES amd64)
|
||||
list(APPEND SOURCE
|
||||
|
@ -55,10 +55,7 @@ include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
|
|||
add_library(wined3d SHARED ${SOURCE})
|
||||
set_module_type(wined3d win32dll)
|
||||
|
||||
target_link_libraries(wined3d
|
||||
${CMAKE_CURRENT_BINARY_DIR}/wined3d.def
|
||||
wine
|
||||
uuid)
|
||||
target_link_libraries(wined3d wine uuid)
|
||||
|
||||
add_importlibs(wined3d
|
||||
user32
|
||||
|
@ -68,7 +65,7 @@ add_importlibs(wined3d
|
|||
msvcrt
|
||||
kernel32
|
||||
ntdll)
|
||||
add_importlib_target(${CMAKE_CURRENT_BINARY_DIR}/wined3d.def)
|
||||
|
||||
add_dependencies(wined3d wineheaders)
|
||||
add_cab_target(wined3d 1)
|
||||
add_cab_target(wined3d 1)
|
||||
add_importlib_target(wined3d.spec)
|
Loading…
Reference in a new issue