[CMAKE]
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Mon, 29 Nov 2010 19:42:58 +0000 (19:42 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Mon, 29 Nov 2010 19:42:58 +0000 (19:42 +0000)
Fix stubs and imports for wine dx

svn path=/branches/cmake-bringup/; revision=49870

20 files changed:
dll/directx/wine/d3d8/CMakeLists.txt
dll/directx/wine/d3d9/CMakeLists.txt
dll/directx/wine/d3dx9_25/CMakeLists.txt
dll/directx/wine/d3dx9_26/CMakeLists.txt
dll/directx/wine/d3dx9_27/CMakeLists.txt
dll/directx/wine/d3dx9_28/CMakeLists.txt
dll/directx/wine/d3dx9_29/CMakeLists.txt
dll/directx/wine/d3dx9_30/CMakeLists.txt
dll/directx/wine/d3dx9_31/CMakeLists.txt
dll/directx/wine/d3dx9_32/CMakeLists.txt
dll/directx/wine/d3dx9_33/CMakeLists.txt
dll/directx/wine/d3dx9_34/CMakeLists.txt
dll/directx/wine/d3dx9_35/CMakeLists.txt
dll/directx/wine/d3dx9_37/CMakeLists.txt
dll/directx/wine/d3dx9_38/CMakeLists.txt
dll/directx/wine/d3dx9_39/CMakeLists.txt
dll/directx/wine/d3dx9_40/CMakeLists.txt
dll/directx/wine/d3dx9_41/CMakeLists.txt
dll/directx/wine/d3dx9_42/CMakeLists.txt
dll/directx/wine/ddraw/CMakeLists.txt

index bbb58aa..0b44eeb 100644 (file)
@@ -5,6 +5,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)
 
 list(APPEND SOURCE
@@ -21,7 +25,7 @@ list(APPEND SOURCE
     volume.c
     volumetexture.c
     version.rc
-    d3d8.def)
+    ${CMAKE_CURRENT_BINARY_DIR}/d3d8.def)
 
 add_library(d3d8 SHARED ${SOURCE})
 
index 931e4f9..4c85618 100644 (file)
@@ -5,6 +5,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)
 
 list(APPEND SOURCE
@@ -23,7 +27,8 @@ list(APPEND SOURCE
     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})
 
index 0ebc251..78ede21 100644 (file)
@@ -5,6 +5,7 @@ spec2def(d3dx9_25.dll d3dx9_25.spec)
 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 @@ target_link_libraries(d3dx9_25
     wine)
 
 add_importlibs(d3dx9_25
+    d3dx9_36
     d3d9
     user32
     gdi32
@@ -28,4 +30,5 @@ add_importlibs(d3dx9_25
     ntdll)
 
 add_dependencies(d3dx9_25 wineheaders)
-add_cab_target(d3dx9_25 1)
\ No newline at end of file
+add_cab_target(d3dx9_25 1)
+add_importlib_target(d3dx9_25.spec libd3dx9_36)
index 0e8b046..ed5fcd8 100644 (file)
@@ -5,6 +5,7 @@ spec2def(d3dx9_26.dll d3dx9_26.spec)
 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 @@ target_link_libraries(d3dx9_26
 
 add_importlibs(d3dx9_26
     d3d9
+    d3dx9_36
     user32
     gdi32
     advapi32
@@ -28,4 +30,4 @@ add_importlibs(d3dx9_26
     ntdll)
 
 add_dependencies(d3dx9_26 wineheaders)
-add_cab_target(d3dx9_26 1)
\ No newline at end of file
+add_cab_target(d3dx9_26 1)
index 46656f9..4bd1fe1 100644 (file)
@@ -5,6 +5,7 @@ spec2def(d3dx9_27.dll d3dx9_27.spec)
 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 @@ target_link_libraries(d3dx9_27
 
 add_importlibs(d3dx9_27
     d3d9
+    d3dx9_36
     user32
     gdi32
     advapi32
@@ -28,4 +30,4 @@ add_importlibs(d3dx9_27
     ntdll)
 
 add_dependencies(d3dx9_27 wineheaders)
-add_cab_target(d3dx9_27 1)
\ No newline at end of file
+add_cab_target(d3dx9_27 1)
index 5d4a24e..5ff06cb 100644 (file)
@@ -5,6 +5,7 @@ spec2def(d3dx9_28.dll d3dx9_28.spec)
 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 @@ target_link_libraries(d3dx9_28
 
 add_importlibs(d3dx9_28
     d3d9
+    d3dx9_36
     user32
     gdi32
     advapi32
@@ -28,4 +30,4 @@ add_importlibs(d3dx9_28
     ntdll)
 
 add_dependencies(d3dx9_28 wineheaders)
-add_cab_target(d3dx9_28 1)
\ No newline at end of file
+add_cab_target(d3dx9_28 1)
index ba9b21d..36e52b0 100644 (file)
@@ -5,6 +5,7 @@ spec2def(d3dx9_29.dll d3dx9_29.spec)
 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 @@ target_link_libraries(d3dx9_29
 
 add_importlibs(d3dx9_29
     d3d9
+    d3dx9_36
     user32
     gdi32
     advapi32
@@ -28,4 +30,4 @@ add_importlibs(d3dx9_29
     ntdll)
 
 add_dependencies(d3dx9_29 wineheaders)
-add_cab_target(d3dx9_29 1)
\ No newline at end of file
+add_cab_target(d3dx9_29 1)
index 558c867..4477578 100644 (file)
@@ -5,6 +5,7 @@ spec2def(d3dx9_30.dll d3dx9_30.spec)
 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 @@ target_link_libraries(d3dx9_30
 
 add_importlibs(d3dx9_30
     d3d9
+    d3dx9_36
     user32
     gdi32
     advapi32
@@ -28,4 +30,4 @@ add_importlibs(d3dx9_30
     ntdll)
 
 add_dependencies(d3dx9_30 wineheaders)
-add_cab_target(d3dx9_30 1)
\ No newline at end of file
+add_cab_target(d3dx9_30 1)
index f4393c5..05480aa 100644 (file)
@@ -5,6 +5,7 @@ spec2def(d3dx9_31.dll d3dx9_31.spec)
 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 @@ target_link_libraries(d3dx9_31
 
 add_importlibs(d3dx9_31
     d3d9
+    d3dx9_36
     user32
     gdi32
     advapi32
@@ -28,4 +30,4 @@ add_importlibs(d3dx9_31
     ntdll)
 
 add_dependencies(d3dx9_31 wineheaders)
-add_cab_target(d3dx9_31 1)
\ No newline at end of file
+add_cab_target(d3dx9_31 1)
index 5f56b16..a20daaa 100644 (file)
@@ -5,6 +5,7 @@ spec2def(d3dx9_32.dll d3dx9_32.spec)
 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 @@ target_link_libraries(d3dx9_32
 
 add_importlibs(d3dx9_32
     d3d9
+    d3dx9_36
     user32
     gdi32
     advapi32
@@ -28,4 +30,4 @@ add_importlibs(d3dx9_32
     ntdll)
 
 add_dependencies(d3dx9_32 wineheaders)
-add_cab_target(d3dx9_32 1)
\ No newline at end of file
+add_cab_target(d3dx9_32 1)
index a578a1a..8475def 100644 (file)
@@ -5,6 +5,7 @@ spec2def(d3dx9_33.dll d3dx9_33.spec)
 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 @@ target_link_libraries(d3dx9_33
 
 add_importlibs(d3dx9_33
     d3d9
+    d3dx9_36
     user32
     gdi32
     advapi32
@@ -28,4 +30,4 @@ add_importlibs(d3dx9_33
     ntdll)
 
 add_dependencies(d3dx9_33 wineheaders)
-add_cab_target(d3dx9_33 1)
\ No newline at end of file
+add_cab_target(d3dx9_33 1)
index 91d1972..54a7a70 100644 (file)
@@ -5,6 +5,7 @@ spec2def(d3dx9_34.dll d3dx9_34.spec)
 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 @@ target_link_libraries(d3dx9_34
 
 add_importlibs(d3dx9_34
     d3d9
+    d3dx9_36
     user32
     gdi32
     advapi32
@@ -28,4 +30,4 @@ add_importlibs(d3dx9_34
     ntdll)
 
 add_dependencies(d3dx9_34 wineheaders)
-add_cab_target(d3dx9_34 1)
\ No newline at end of file
+add_cab_target(d3dx9_34 1)
index 7bbe499..cb283e7 100644 (file)
@@ -18,6 +18,7 @@ target_link_libraries(d3dx9_35
     wine)
 
 add_importlibs(d3dx9_35
+    d3dx9_36
     d3d9
     user32
     gdi32
@@ -28,4 +29,4 @@ add_importlibs(d3dx9_35
     ntdll)
 
 add_dependencies(d3dx9_35 wineheaders)
-add_cab_target(d3dx9_35 1)
\ No newline at end of file
+add_cab_target(d3dx9_35 1)
index 2b114ac..86b0013 100644 (file)
@@ -18,6 +18,7 @@ target_link_libraries(d3dx9_37
     wine)
 
 add_importlibs(d3dx9_37
+    d3dx9_36
     d3d9
     user32
     gdi32
@@ -28,4 +29,4 @@ add_importlibs(d3dx9_37
     ntdll)
 
 add_dependencies(d3dx9_37 wineheaders)
-add_cab_target(d3dx9_37 1)
\ No newline at end of file
+add_cab_target(d3dx9_37 1)
index bb52f12..0358e8d 100644 (file)
@@ -18,6 +18,7 @@ target_link_libraries(d3dx9_38
     wine)
 
 add_importlibs(d3dx9_38
+    d3dx9_36
     d3d9
     user32
     gdi32
@@ -28,4 +29,4 @@ add_importlibs(d3dx9_38
     ntdll)
 
 add_dependencies(d3dx9_38 wineheaders)
-add_cab_target(d3dx9_38 1)
\ No newline at end of file
+add_cab_target(d3dx9_38 1)
index 50b216f..0f3df34 100644 (file)
@@ -18,6 +18,7 @@ target_link_libraries(d3dx9_39
     wine)
 
 add_importlibs(d3dx9_39
+    d3dx9_36
     d3d9
     user32
     gdi32
@@ -28,4 +29,4 @@ add_importlibs(d3dx9_39
     ntdll)
 
 add_dependencies(d3dx9_39 wineheaders)
-add_cab_target(d3dx9_39 1)
\ No newline at end of file
+add_cab_target(d3dx9_39 1)
index 3741043..1522eb3 100644 (file)
@@ -18,6 +18,7 @@ target_link_libraries(d3dx9_40
     wine)
 
 add_importlibs(d3dx9_40
+    d3dx9_36
     d3d9
     user32
     gdi32
@@ -28,4 +29,4 @@ add_importlibs(d3dx9_40
     ntdll)
 
 add_dependencies(d3dx9_40 wineheaders)
-add_cab_target(d3dx9_40 1)
\ No newline at end of file
+add_cab_target(d3dx9_40 1)
index 7ccc3a6..5e0c94f 100644 (file)
@@ -18,6 +18,7 @@ target_link_libraries(d3dx9_41
     wine)
 
 add_importlibs(d3dx9_41
+    d3dx9_36
     d3d9
     user32
     gdi32
@@ -28,4 +29,4 @@ add_importlibs(d3dx9_41
     ntdll)
 
 add_dependencies(d3dx9_41 wineheaders)
-add_cab_target(d3dx9_41 1)
\ No newline at end of file
+add_cab_target(d3dx9_41 1)
index 938409d..1d7bda2 100644 (file)
@@ -18,6 +18,7 @@ target_link_libraries(d3dx9_42
     wine)
 
 add_importlibs(d3dx9_42
+    d3dx9_36
     d3d9
     user32
     gdi32
@@ -28,4 +29,4 @@ add_importlibs(d3dx9_42
     ntdll)
 
 add_dependencies(d3dx9_42 wineheaders)
-add_cab_target(d3dx9_42 1)
\ No newline at end of file
+add_cab_target(d3dx9_42 1)
index 4d6ab9c..93a002e 100644 (file)
@@ -19,7 +19,8 @@ list(APPEND SOURCE
     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_importlibs(ddraw
 
 add_dependencies(ddraw wineheaders)
 add_cab_target(ddraw 1)
-add_importlib_target(ddraw.spec)
\ No newline at end of file
+add_importlib_target(ddraw.spec)