[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

diff --git a/dll/directx/wine/d3dx9_24/CMakeLists.txt b/dll/directx/wine/d3dx9_24/CMakeLists.txt
index 309c718..9b66de1 100644 (file)
--- 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_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 78ede21..b8daec5 100644 (file)
--- 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
 
 add_importlibs(d3dx9_25
     d3dx9_36

+    d3dx9_24

     d3d9
     user32
     gdi32
     d3d9
     user32
     gdi32


@@ -31,4 +32,4 @@ add_importlibs(d3dx9_25
 
 add_dependencies(d3dx9_25 wineheaders)
 add_cab_target(d3dx9_25 1)
 
 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 ed5fcd8..91c607e 100644 (file)
--- 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
 add_importlibs(d3dx9_26
     d3d9
     d3dx9_36

+    d3dx9_24

     user32
     gdi32
     advapi32
     user32
     gdi32
     advapi32

diff --git a/dll/directx/wine/d3dx9_27/CMakeLists.txt b/dll/directx/wine/d3dx9_27/CMakeLists.txt
index 4bd1fe1..b5cdeb7 100644 (file)
--- 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
 
 add_importlibs(d3dx9_27
     d3d9

+    d3dx9_24

     d3dx9_36
     user32
     gdi32
     d3dx9_36
     user32
     gdi32

diff --git a/dll/directx/wine/d3dx9_28/CMakeLists.txt b/dll/directx/wine/d3dx9_28/CMakeLists.txt
index 5ff06cb..ec679aa 100644 (file)
--- 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
 
 add_importlibs(d3dx9_28
     d3d9

+    d3dx9_24

     d3dx9_36
     user32
     gdi32
     d3dx9_36
     user32
     gdi32

diff --git a/dll/directx/wine/d3dx9_29/CMakeLists.txt b/dll/directx/wine/d3dx9_29/CMakeLists.txt
index 36e52b0..c51f0b0 100644 (file)
--- 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
 
 add_importlibs(d3dx9_29
     d3d9

+    d3dx9_24

     d3dx9_36
     user32
     gdi32
     d3dx9_36
     user32
     gdi32

diff --git a/dll/directx/wine/d3dx9_30/CMakeLists.txt b/dll/directx/wine/d3dx9_30/CMakeLists.txt
index 4477578..d1c271f 100644 (file)
--- 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
 
 add_importlibs(d3dx9_30
     d3d9

+    d3dx9_24

     d3dx9_36
     user32
     gdi32
     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 e9c7004..ffd5361 100644 (file)
--- 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"
 
 
 #include "d3dx9.h"
 

+#ifdef _MSC_VER
+DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46);
+#endif
+

 /***********************************************************************
  * DllMain.
  */
 /***********************************************************************
  * DllMain.
  */