Fix stubs and imports for wine dx

svn path=/branches/cmake-bringup/; revision=49870
This commit is contained in:
Timo Kreuzer
2010-11-29 19:42:58 +00:00
parent 5ef10219b5
commit db7b8d8030
20 changed files with 59 additions and 21 deletions
+5 -1
View 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})
+6 -1
View 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})
+4 -1
View 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)
add_cab_target(d3dx9_25 1)
add_importlib_target(d3dx9_25.spec libd3dx9_36)
+3 -1
View 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)
add_cab_target(d3dx9_26 1)
+3 -1
View 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)
add_cab_target(d3dx9_27 1)
+3 -1
View 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)
add_cab_target(d3dx9_28 1)
+3 -1
View 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)
add_cab_target(d3dx9_29 1)
+3 -1
View 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)
add_cab_target(d3dx9_30 1)
+3 -1
View 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)
add_cab_target(d3dx9_31 1)
+3 -1
View 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)
add_cab_target(d3dx9_32 1)
+3 -1
View 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)
add_cab_target(d3dx9_33 1)
+3 -1
View 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)
add_cab_target(d3dx9_34 1)
+2 -1
View 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)
add_cab_target(d3dx9_35 1)
+2 -1
View 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)
add_cab_target(d3dx9_37 1)
+2 -1
View 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)
add_cab_target(d3dx9_38 1)
+2 -1
View 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)
add_cab_target(d3dx9_39 1)
+2 -1
View 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)
add_cab_target(d3dx9_40 1)
+2 -1
View 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)
add_cab_target(d3dx9_41 1)
+2 -1
View 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)
add_cab_target(d3dx9_42 1)
+3 -2
View 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)
add_importlib_target(ddraw.spec)