[ros-diffs] [tkreuzer] 49891: [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

Author: tkreuzer
Date: Thu Dec  2 11:49:15 2010
New Revision: 49891

URL: http://svn.reactos.org/svn/reactos?rev=49891&view=rev
Log:
[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

Modified:
    branches/cmake-bringup/dll/directx/wine/d3dx9_24/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/d3dx9_25/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/d3dx9_26/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/d3dx9_27/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/d3dx9_28/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/d3dx9_29/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/d3dx9_30/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/d3dx9_36/d3dx9_36_main.c

Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_24/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/d3dx9_24/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/d3dx9_24/CMakeLists.txt [iso-8859-1] Thu Dec 
2 11:49:15 2010
@@ -31,3 +31,4 @@
 
 add_dependencies(d3dx9_24 wineheaders)
 add_cab_target(d3dx9_24 1)
+add_importlib_target(d3dx9_24.spec libd3dx9_36)

Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_25/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/d3dx9_25/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/d3dx9_25/CMakeLists.txt [iso-8859-1] Thu Dec 
2 11:49:15 2010
@@ -20,6 +20,7 @@
 
 add_importlibs(d3dx9_25
     d3dx9_36
+    d3dx9_24
     d3d9
     user32
     gdi32
@@ -31,4 +32,4 @@
 
 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)

Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_26/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/d3dx9_26/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/d3dx9_26/CMakeLists.txt [iso-8859-1] Thu Dec 
2 11:49:15 2010
@@ -21,6 +21,7 @@
 add_importlibs(d3dx9_26
     d3d9
     d3dx9_36
+    d3dx9_24
     user32
     gdi32
     advapi32

Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_27/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/d3dx9_27/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/d3dx9_27/CMakeLists.txt [iso-8859-1] Thu Dec 
2 11:49:15 2010
@@ -20,6 +20,7 @@
 
 add_importlibs(d3dx9_27
     d3d9
+    d3dx9_24
     d3dx9_36
     user32
     gdi32

Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_28/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/d3dx9_28/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/d3dx9_28/CMakeLists.txt [iso-8859-1] Thu Dec 
2 11:49:15 2010
@@ -20,6 +20,7 @@
 
 add_importlibs(d3dx9_28
     d3d9
+    d3dx9_24
     d3dx9_36
     user32
     gdi32

Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_29/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/d3dx9_29/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/d3dx9_29/CMakeLists.txt [iso-8859-1] Thu Dec 
2 11:49:15 2010
@@ -20,6 +20,7 @@
 
 add_importlibs(d3dx9_29
     d3d9
+    d3dx9_24
     d3dx9_36
     user32
     gdi32

Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_30/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/d3dx9_30/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/d3dx9_30/CMakeLists.txt [iso-8859-1] Thu Dec 
2 11:49:15 2010
@@ -20,6 +20,7 @@
 
 add_importlibs(d3dx9_30
     d3d9
+    d3dx9_24
     d3dx9_36
     user32
     gdi32

Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_36/d3dx9_36_main.c
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/d3dx9_36/d3dx9_36_main.c [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/d3dx9_36/d3dx9_36_main.c [iso-8859-1] Thu Dec 
2 11:49:15 2010
@@ -32,6 +32,10 @@
 #include "winuser.h"
 
 #include "d3dx9.h"
+
+#ifdef _MSC_VER
+DEFINE_GUID(IID_IUnknown, 0x00000000, 0x0000, 0x0000, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x46);
+#endif
 
 /***********************************************************************
  * DllMain.