From 5c87a775bf4ce6314a16aae9454ccc1ffca74d6c Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Thu, 2 Dec 2010 11:49:15 +0000
Subject: [PATCH] [CMAKE] - Link wine dx, that do forwards to the respective
 import libs (MSVC requires that) - add import lib for d3dx9_24 - add
 IID_IUnknown to d3dx9_36_main.c for MSVC

svn path=/branches/cmake-bringup/; revision=49891
---
 dll/directx/wine/d3dx9_24/CMakeLists.txt  | 1 +
 dll/directx/wine/d3dx9_25/CMakeLists.txt  | 3 ++-
 dll/directx/wine/d3dx9_26/CMakeLists.txt  | 1 +
 dll/directx/wine/d3dx9_27/CMakeLists.txt  | 1 +
 dll/directx/wine/d3dx9_28/CMakeLists.txt  | 1 +
 dll/directx/wine/d3dx9_29/CMakeLists.txt  | 1 +
 dll/directx/wine/d3dx9_30/CMakeLists.txt  | 1 +
 dll/directx/wine/d3dx9_36/d3dx9_36_main.c | 4 ++++
 8 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/dll/directx/wine/d3dx9_24/CMakeLists.txt b/dll/directx/wine/d3dx9_24/CMakeLists.txt
index 309c7180109..9b66de1d449 100644
--- a/dll/directx/wine/d3dx9_24/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_24/CMakeLists.txt
@@ -31,3 +31,4 @@ add_importlibs(d3dx9_24
 
 add_dependencies(d3dx9_24 wineheaders)
 add_cab_target(d3dx9_24 1)
+add_importlib_target(d3dx9_24.spec libd3dx9_36)
diff --git a/dll/directx/wine/d3dx9_25/CMakeLists.txt b/dll/directx/wine/d3dx9_25/CMakeLists.txt
index 78ede214ee4..b8daec5b2a0 100644
--- a/dll/directx/wine/d3dx9_25/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_25/CMakeLists.txt
@@ -20,6 +20,7 @@ target_link_libraries(d3dx9_25
 
 add_importlibs(d3dx9_25
     d3dx9_36
+    d3dx9_24
     d3d9
     user32
     gdi32
@@ -31,4 +32,4 @@ add_importlibs(d3dx9_25
 
 add_dependencies(d3dx9_25 wineheaders)
 add_cab_target(d3dx9_25 1)
-add_importlib_target(d3dx9_25.spec libd3dx9_36)
+add_importlib_target(d3dx9_25.spec libd3dx9_24 libd3dx9_36)
diff --git a/dll/directx/wine/d3dx9_26/CMakeLists.txt b/dll/directx/wine/d3dx9_26/CMakeLists.txt
index ed5fcd8422d..91c607ee2a6 100644
--- a/dll/directx/wine/d3dx9_26/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_26/CMakeLists.txt
@@ -21,6 +21,7 @@ target_link_libraries(d3dx9_26
 add_importlibs(d3dx9_26
     d3d9
     d3dx9_36
+    d3dx9_24
     user32
     gdi32
     advapi32
diff --git a/dll/directx/wine/d3dx9_27/CMakeLists.txt b/dll/directx/wine/d3dx9_27/CMakeLists.txt
index 4bd1fe15e56..b5cdeb7a9c5 100644
--- a/dll/directx/wine/d3dx9_27/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_27/CMakeLists.txt
@@ -20,6 +20,7 @@ target_link_libraries(d3dx9_27
 
 add_importlibs(d3dx9_27
     d3d9
+    d3dx9_24
     d3dx9_36
     user32
     gdi32
diff --git a/dll/directx/wine/d3dx9_28/CMakeLists.txt b/dll/directx/wine/d3dx9_28/CMakeLists.txt
index 5ff06cbc8f0..ec679aae287 100644
--- a/dll/directx/wine/d3dx9_28/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_28/CMakeLists.txt
@@ -20,6 +20,7 @@ target_link_libraries(d3dx9_28
 
 add_importlibs(d3dx9_28
     d3d9
+    d3dx9_24
     d3dx9_36
     user32
     gdi32
diff --git a/dll/directx/wine/d3dx9_29/CMakeLists.txt b/dll/directx/wine/d3dx9_29/CMakeLists.txt
index 36e52b07a5a..c51f0b021e2 100644
--- a/dll/directx/wine/d3dx9_29/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_29/CMakeLists.txt
@@ -20,6 +20,7 @@ target_link_libraries(d3dx9_29
 
 add_importlibs(d3dx9_29
     d3d9
+    d3dx9_24
     d3dx9_36
     user32
     gdi32
diff --git a/dll/directx/wine/d3dx9_30/CMakeLists.txt b/dll/directx/wine/d3dx9_30/CMakeLists.txt
index 44775783141..d1c271fb705 100644
--- a/dll/directx/wine/d3dx9_30/CMakeLists.txt
+++ b/dll/directx/wine/d3dx9_30/CMakeLists.txt
@@ -20,6 +20,7 @@ target_link_libraries(d3dx9_30
 
 add_importlibs(d3dx9_30
     d3d9
+    d3dx9_24
     d3dx9_36
     user32
     gdi32
diff --git a/dll/directx/wine/d3dx9_36/d3dx9_36_main.c b/dll/directx/wine/d3dx9_36/d3dx9_36_main.c
index e9c700444ef..ffd5361c457 100644
--- a/dll/directx/wine/d3dx9_36/d3dx9_36_main.c
+++ b/dll/directx/wine/d3dx9_36/d3dx9_36_main.c
@@ -33,6 +33,10 @@
 
 #include "d3dx9.h"
 
+#ifdef _MSC_VER
+DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46);
+#endif
+
 /***********************************************************************
  * DllMain.
  */
-- 
2.17.1