[ros-diffs] [tkreuzer] 49870: [CMAKE] Fix stubs and imports for wine dx

29 Nov 2010

Author: tkreuzer
Date: Mon Nov 29 19:42:58 2010
New Revision: 49870

URL: http://svn.reactos.org/svn/reactos?rev=49870&view=rev
Log:
[CMAKE]
Fix stubs and imports for wine dx

Modified:
    branches/cmake-bringup/dll/directx/wine/d3d8/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/d3d9/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_31/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/d3dx9_32/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/d3dx9_33/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/d3dx9_34/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/d3dx9_35/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/d3dx9_37/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/d3dx9_38/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/d3dx9_39/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/d3dx9_40/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/d3dx9_41/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/d3dx9_42/CMakeLists.txt
    branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt

Modified: branches/cmake-bringup/dll/directx/wine/d3d8/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================

--- branches/cmake-bringup/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/wine/d3d8/CMakeLists.txt [iso-8859-1] Mon Nov 29
19:42:58 2010
@@ -4,6 +4,10 @@
 add_definitions(-D__WINESRC__)
 add_definitions(-DUSE_WIN32_OPENGL)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+if(MSVC)
+    add_definitions(-FImsvchelper.h)
+endif()
 
 spec2def(d3d8.dll d3d8.spec)
 
@@ -21,7 +25,7 @@
     volume.c
     volumetexture.c
     version.rc
-    d3d8.def)
+    ${CMAKE_CURRENT_BINARY_DIR}/d3d8.def)
 
 add_library(d3d8 SHARED ${SOURCE})
 

Modified: branches/cmake-bringup/dll/directx/wine/d3d9/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/wine/d3d9/CMakeLists.txt [iso-8859-1] Mon Nov 29
19:42:58 2010
@@ -4,6 +4,10 @@
 add_definitions(-D__WINESRC__)
 add_definitions(-DUSE_WIN32_OPENGL)
 include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine)
+
+if(MSVC)
+    add_definitions(-FImsvchelper.h)
+endif()
 
 spec2def(d3d9.dll d3d9.spec)
 
@@ -23,7 +27,8 @@
     volume.c
     volumetexture.c
     version.rc
-    d3d9.def)
+    ${CMAKE_CURRENT_BINARY_DIR}/d3d9_stubs.c
+    ${CMAKE_CURRENT_BINARY_DIR}/d3d9.def)
 
 add_library(d3d9 SHARED ${SOURCE})
 

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] Mon Nov
29 19:42:58 2010
@@ -5,6 +5,7 @@
 list(APPEND SOURCE
     d3dx9_25_main.c
     version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_25_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_25.def)
 
 add_definitions(-D__WINESRC__)
@@ -18,6 +19,7 @@
     wine)
 
 add_importlibs(d3dx9_25
+    d3dx9_36
     d3d9
     user32
     gdi32
@@ -28,4 +30,5 @@
     ntdll)
 
 add_dependencies(d3dx9_25 wineheaders)
-add_cab_target(d3dx9_25 1)
+add_cab_target(d3dx9_25 1)
+add_importlib_target(d3dx9_25.spec 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] Mon Nov
29 19:42:58 2010
@@ -5,6 +5,7 @@
 list(APPEND SOURCE
     d3dx9_26_main.c
     version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_26_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_26.def)
 
 add_definitions(-D__WINESRC__)
@@ -19,6 +20,7 @@
 
 add_importlibs(d3dx9_26
     d3d9
+    d3dx9_36
     user32
     gdi32
     advapi32
@@ -28,4 +30,4 @@
     ntdll)
 
 add_dependencies(d3dx9_26 wineheaders)
-add_cab_target(d3dx9_26 1)
+add_cab_target(d3dx9_26 1)

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] Mon Nov
29 19:42:58 2010
@@ -5,6 +5,7 @@
 list(APPEND SOURCE
     d3dx9_27_main.c
     version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_27_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_27.def)
 
 add_definitions(-D__WINESRC__)
@@ -19,6 +20,7 @@
 
 add_importlibs(d3dx9_27
     d3d9
+    d3dx9_36
     user32
     gdi32
     advapi32
@@ -28,4 +30,4 @@
     ntdll)
 
 add_dependencies(d3dx9_27 wineheaders)
-add_cab_target(d3dx9_27 1)
+add_cab_target(d3dx9_27 1)

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] Mon Nov
29 19:42:58 2010
@@ -5,6 +5,7 @@
 list(APPEND SOURCE
     d3dx9_28_main.c
     version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_28_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_28.def)
 
 add_definitions(-D__WINESRC__)
@@ -19,6 +20,7 @@
 
 add_importlibs(d3dx9_28
     d3d9
+    d3dx9_36
     user32
     gdi32
     advapi32
@@ -28,4 +30,4 @@
     ntdll)
 
 add_dependencies(d3dx9_28 wineheaders)
-add_cab_target(d3dx9_28 1)
+add_cab_target(d3dx9_28 1)

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] Mon Nov
29 19:42:58 2010
@@ -5,6 +5,7 @@
 list(APPEND SOURCE
     d3dx9_29_main.c
     version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_29_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_29.def)
 
 add_definitions(-D__WINESRC__)
@@ -19,6 +20,7 @@
 
 add_importlibs(d3dx9_29
     d3d9
+    d3dx9_36
     user32
     gdi32
     advapi32
@@ -28,4 +30,4 @@
     ntdll)
 
 add_dependencies(d3dx9_29 wineheaders)
-add_cab_target(d3dx9_29 1)
+add_cab_target(d3dx9_29 1)

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] Mon Nov
29 19:42:58 2010
@@ -5,6 +5,7 @@
 list(APPEND SOURCE
     d3dx9_30_main.c
     version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_30_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_30.def)
 
 add_definitions(-D__WINESRC__)
@@ -19,6 +20,7 @@
 
 add_importlibs(d3dx9_30
     d3d9
+    d3dx9_36
     user32
     gdi32
     advapi32
@@ -28,4 +30,4 @@
     ntdll)
 
 add_dependencies(d3dx9_30 wineheaders)
-add_cab_target(d3dx9_30 1)
+add_cab_target(d3dx9_30 1)

Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_31/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/d3dx9_31/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/d3dx9_31/CMakeLists.txt [iso-8859-1] Mon Nov
29 19:42:58 2010
@@ -5,6 +5,7 @@
 list(APPEND SOURCE
     d3dx9_31_main.c
     version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_31_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_31.def)
 
 add_definitions(-D__WINESRC__)
@@ -19,6 +20,7 @@
 
 add_importlibs(d3dx9_31
     d3d9
+    d3dx9_36
     user32
     gdi32
     advapi32
@@ -28,4 +30,4 @@
     ntdll)
 
 add_dependencies(d3dx9_31 wineheaders)
-add_cab_target(d3dx9_31 1)
+add_cab_target(d3dx9_31 1)

Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/d3dx9_32/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/d3dx9_32/CMakeLists.txt [iso-8859-1] Mon Nov
29 19:42:58 2010
@@ -5,6 +5,7 @@
 list(APPEND SOURCE
     d3dx9_32_main.c
     version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_32_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_32.def)
 
 add_definitions(-D__WINESRC__)
@@ -19,6 +20,7 @@
 
 add_importlibs(d3dx9_32
     d3d9
+    d3dx9_36
     user32
     gdi32
     advapi32
@@ -28,4 +30,4 @@
     ntdll)
 
 add_dependencies(d3dx9_32 wineheaders)
-add_cab_target(d3dx9_32 1)
+add_cab_target(d3dx9_32 1)

Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_33/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/d3dx9_33/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/d3dx9_33/CMakeLists.txt [iso-8859-1] Mon Nov
29 19:42:58 2010
@@ -5,6 +5,7 @@
 list(APPEND SOURCE
     d3dx9_33_main.c
     version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_33_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_33.def)
 
 add_definitions(-D__WINESRC__)
@@ -19,6 +20,7 @@
 
 add_importlibs(d3dx9_33
     d3d9
+    d3dx9_36
     user32
     gdi32
     advapi32
@@ -28,4 +30,4 @@
     ntdll)
 
 add_dependencies(d3dx9_33 wineheaders)
-add_cab_target(d3dx9_33 1)
+add_cab_target(d3dx9_33 1)

Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_34/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/d3dx9_34/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/d3dx9_34/CMakeLists.txt [iso-8859-1] Mon Nov
29 19:42:58 2010
@@ -5,6 +5,7 @@
 list(APPEND SOURCE
     d3dx9_34_main.c
     version.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_34_stubs.c
     ${CMAKE_CURRENT_BINARY_DIR}/d3dx9_34.def)
 
 add_definitions(-D__WINESRC__)
@@ -19,6 +20,7 @@
 
 add_importlibs(d3dx9_34
     d3d9
+    d3dx9_36
     user32
     gdi32
     advapi32
@@ -28,4 +30,4 @@
     ntdll)
 
 add_dependencies(d3dx9_34 wineheaders)
-add_cab_target(d3dx9_34 1)
+add_cab_target(d3dx9_34 1)

Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_35/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/d3dx9_35/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/d3dx9_35/CMakeLists.txt [iso-8859-1] Mon Nov
29 19:42:58 2010
@@ -18,6 +18,7 @@
     wine)
 
 add_importlibs(d3dx9_35
+    d3dx9_36
     d3d9
     user32
     gdi32
@@ -28,4 +29,4 @@
     ntdll)
 
 add_dependencies(d3dx9_35 wineheaders)
-add_cab_target(d3dx9_35 1)
+add_cab_target(d3dx9_35 1)

Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_37/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/d3dx9_37/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/d3dx9_37/CMakeLists.txt [iso-8859-1] Mon Nov
29 19:42:58 2010
@@ -18,6 +18,7 @@
     wine)
 
 add_importlibs(d3dx9_37
+    d3dx9_36
     d3d9
     user32
     gdi32
@@ -28,4 +29,4 @@
     ntdll)
 
 add_dependencies(d3dx9_37 wineheaders)
-add_cab_target(d3dx9_37 1)
+add_cab_target(d3dx9_37 1)

Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_38/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/d3dx9_38/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/d3dx9_38/CMakeLists.txt [iso-8859-1] Mon Nov
29 19:42:58 2010
@@ -18,6 +18,7 @@
     wine)
 
 add_importlibs(d3dx9_38
+    d3dx9_36
     d3d9
     user32
     gdi32
@@ -28,4 +29,4 @@
     ntdll)
 
 add_dependencies(d3dx9_38 wineheaders)
-add_cab_target(d3dx9_38 1)
+add_cab_target(d3dx9_38 1)

Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_39/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/d3dx9_39/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/d3dx9_39/CMakeLists.txt [iso-8859-1] Mon Nov
29 19:42:58 2010
@@ -18,6 +18,7 @@
     wine)
 
 add_importlibs(d3dx9_39
+    d3dx9_36
     d3d9
     user32
     gdi32
@@ -28,4 +29,4 @@
     ntdll)
 
 add_dependencies(d3dx9_39 wineheaders)
-add_cab_target(d3dx9_39 1)
+add_cab_target(d3dx9_39 1)

Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_40/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/d3dx9_40/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/d3dx9_40/CMakeLists.txt [iso-8859-1] Mon Nov
29 19:42:58 2010
@@ -18,6 +18,7 @@
     wine)
 
 add_importlibs(d3dx9_40
+    d3dx9_36
     d3d9
     user32
     gdi32
@@ -28,4 +29,4 @@
     ntdll)
 
 add_dependencies(d3dx9_40 wineheaders)
-add_cab_target(d3dx9_40 1)
+add_cab_target(d3dx9_40 1)

Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_41/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/d3dx9_41/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/d3dx9_41/CMakeLists.txt [iso-8859-1] Mon Nov
29 19:42:58 2010
@@ -18,6 +18,7 @@
     wine)
 
 add_importlibs(d3dx9_41
+    d3dx9_36
     d3d9
     user32
     gdi32
@@ -28,4 +29,4 @@
     ntdll)
 
 add_dependencies(d3dx9_41 wineheaders)
-add_cab_target(d3dx9_41 1)
+add_cab_target(d3dx9_41 1)

Modified: branches/cmake-bringup/dll/directx/wine/d3dx9_42/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/d3dx9_42/CMakeLists.txt [iso-8859-1]
(original)
+++ branches/cmake-bringup/dll/directx/wine/d3dx9_42/CMakeLists.txt [iso-8859-1] Mon Nov
29 19:42:58 2010
@@ -18,6 +18,7 @@
     wine)
 
 add_importlibs(d3dx9_42
+    d3dx9_36
     d3d9
     user32
     gdi32
@@ -28,4 +29,4 @@
     ntdll)
 
 add_dependencies(d3dx9_42 wineheaders)
-add_cab_target(d3dx9_42 1)
+add_cab_target(d3dx9_42 1)

Modified: branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/branches/cmake-bringup/dll/directx/wine/…
==============================================================================
--- branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] (original)
+++ branches/cmake-bringup/dll/directx/wine/ddraw/CMakeLists.txt [iso-8859-1] Mon Nov 29
19:42:58 2010
@@ -19,7 +19,8 @@
     vertexbuffer.c
     viewport.c
     version.rc
-    ddraw.def)
+    ${CMAKE_CURRENT_BINARY_DIR}/ddraw_stubs.c
+    ${CMAKE_CURRENT_BINARY_DIR}/ddraw.def)
 
 add_definitions(
     -D__WINESRC__
@@ -51,4 +52,4 @@
 
 add_dependencies(ddraw wineheaders)
 add_cab_target(ddraw 1)
-add_importlib_target(ddraw.spec)
+add_importlib_target(ddraw.spec)



    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

[ros-diffs] [tkreuzer] 49870: [CMAKE] Fix stubs and imports for wine dx