From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Sun, 28 Nov 2010 01:24:36 +0000 (+0000)
Subject: [CMAKE]
X-Git-Tag: backups/GSoC_2011/GSoC_Themes@51550~399
X-Git-Url: https://git.reactos.org/?p=reactos.git;a=commitdiff_plain;h=f5cd0290d4e3c4f750a2ce7c2413f62943b63128;ds=inline

[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
---

diff --git a/dll/3rdparty/libxslt/CMakeLists.txt b/dll/3rdparty/libxslt/CMakeLists.txt
index 317b6bd52f1..26111a6d4d0 100644
--- a/dll/3rdparty/libxslt/CMakeLists.txt
+++ b/dll/3rdparty/libxslt/CMakeLists.txt
@@ -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)
 
diff --git a/dll/directx/CMakeLists.txt b/dll/directx/CMakeLists.txt
index 0f677faf885..5a92a036a35 100644
--- a/dll/directx/CMakeLists.txt
+++ b/dll/directx/CMakeLists.txt
@@ -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)
diff --git a/dll/directx/dinput/CMakeLists.txt b/dll/directx/dinput/CMakeLists.txt
index 4325ace8ed2..9f7e692764a 100644
--- a/dll/directx/dinput/CMakeLists.txt
+++ b/dll/directx/dinput/CMakeLists.txt
@@ -38,3 +38,4 @@ add_importlibs(dinput
 
 
 add_cab_target(dinput 1)
+add_importlib_target(dinput.spec)
diff --git a/dll/directx/quartz/CMakeLists.txt b/dll/directx/quartz/CMakeLists.txt
index 1b9815eeb18..e7f285779ce 100644
--- a/dll/directx/quartz/CMakeLists.txt
+++ b/dll/directx/quartz/CMakeLists.txt
@@ -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
diff --git a/dll/directx/wine/wined3d/CMakeLists.txt b/dll/directx/wine/wined3d/CMakeLists.txt
index 94187d5b717..023ec894662 100644
--- a/dll/directx/wine/wined3d/CMakeLists.txt
+++ b/dll/directx/wine/wined3d/CMakeLists.txt
@@ -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)
\ No newline at end of file
+add_cab_target(wined3d 1)
+add_importlib_target(wined3d.spec)
\ No newline at end of file