From 7ba859bd6bd304d2d25a4dfb30e6614e6c42b551 Mon Sep 17 00:00:00 2001 From: Sylvain Petreolle Date: Sun, 17 Jul 2011 11:55:57 +0000 Subject: [PATCH] [D3D] Do not link d3dx9 dlls to wined3d. svn path=/trunk/; revision=52711 --- reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt | 1 - reactos/dll/directx/wine/d3dx9_24/d3dx9_24.rbuild | 1 - reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt | 1 - reactos/dll/directx/wine/d3dx9_25/d3dx9_25.rbuild | 1 - reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt | 1 - reactos/dll/directx/wine/d3dx9_26/d3dx9_26.rbuild | 1 - reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt | 1 - reactos/dll/directx/wine/d3dx9_27/d3dx9_27.rbuild | 1 - reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt | 1 - reactos/dll/directx/wine/d3dx9_28/d3dx9_28.rbuild | 1 - reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt | 1 - reactos/dll/directx/wine/d3dx9_29/d3dx9_29.rbuild | 1 - reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt | 1 - reactos/dll/directx/wine/d3dx9_30/d3dx9_30.rbuild | 1 - reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt | 1 - reactos/dll/directx/wine/d3dx9_31/d3dx9_31.rbuild | 1 - reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt | 1 - reactos/dll/directx/wine/d3dx9_32/d3dx9_32.rbuild | 1 - reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt | 1 - reactos/dll/directx/wine/d3dx9_33/d3dx9_33.rbuild | 1 - reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt | 1 - reactos/dll/directx/wine/d3dx9_34/d3dx9_34.rbuild | 1 - reactos/dll/directx/wine/d3dx9_35/CMakeLists.txt | 1 - reactos/dll/directx/wine/d3dx9_35/d3dx9_35.rbuild | 1 - reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt | 1 - reactos/dll/directx/wine/d3dx9_36/d3dx9_36.rbuild | 1 - reactos/dll/directx/wine/d3dx9_37/CMakeLists.txt | 1 - reactos/dll/directx/wine/d3dx9_37/d3dx9_37.rbuild | 1 - reactos/dll/directx/wine/d3dx9_38/CMakeLists.txt | 1 - reactos/dll/directx/wine/d3dx9_38/d3dx9_38.rbuild | 1 - reactos/dll/directx/wine/d3dx9_39/CMakeLists.txt | 1 - reactos/dll/directx/wine/d3dx9_39/d3dx9_39.rbuild | 1 - reactos/dll/directx/wine/d3dx9_40/CMakeLists.txt | 1 - reactos/dll/directx/wine/d3dx9_40/d3dx9_40.rbuild | 1 - reactos/dll/directx/wine/d3dx9_41/CMakeLists.txt | 1 - reactos/dll/directx/wine/d3dx9_41/d3dx9_41.rbuild | 1 - reactos/dll/directx/wine/d3dx9_42/CMakeLists.txt | 1 - reactos/dll/directx/wine/d3dx9_42/d3dx9_42.rbuild | 1 - 38 files changed, 38 deletions(-) diff --git a/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt index 39ce0ce0371..5ad6cb35f9e 100644 --- a/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_24/CMakeLists.txt @@ -24,7 +24,6 @@ add_importlibs(d3dx9_24 user32 gdi32 advapi32 - wined3d msvcrt kernel32 ntdll) diff --git a/reactos/dll/directx/wine/d3dx9_24/d3dx9_24.rbuild b/reactos/dll/directx/wine/d3dx9_24/d3dx9_24.rbuild index a59b236c196..fc25312e0d0 100644 --- a/reactos/dll/directx/wine/d3dx9_24/d3dx9_24.rbuild +++ b/reactos/dll/directx/wine/d3dx9_24/d3dx9_24.rbuild @@ -11,7 +11,6 @@ user32 gdi32 advapi32 - wined3d d3dx9_24_main.c version.rc diff --git a/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt index 98c9a7f9e79..c7b5b2c2a61 100644 --- a/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_25/CMakeLists.txt @@ -25,7 +25,6 @@ add_importlibs(d3dx9_25 user32 gdi32 advapi32 - wined3d msvcrt kernel32 ntdll) diff --git a/reactos/dll/directx/wine/d3dx9_25/d3dx9_25.rbuild b/reactos/dll/directx/wine/d3dx9_25/d3dx9_25.rbuild index 0fadc998ba1..129135cc691 100644 --- a/reactos/dll/directx/wine/d3dx9_25/d3dx9_25.rbuild +++ b/reactos/dll/directx/wine/d3dx9_25/d3dx9_25.rbuild @@ -11,7 +11,6 @@ user32 gdi32 advapi32 - wined3d d3dx9_25_main.c version.rc diff --git a/reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt index 82f45db4c0e..efb2eeb47a2 100644 --- a/reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_26/CMakeLists.txt @@ -25,7 +25,6 @@ add_importlibs(d3dx9_26 user32 gdi32 advapi32 - wined3d msvcrt kernel32 ntdll) diff --git a/reactos/dll/directx/wine/d3dx9_26/d3dx9_26.rbuild b/reactos/dll/directx/wine/d3dx9_26/d3dx9_26.rbuild index 1a5965c2513..887eff22f66 100644 --- a/reactos/dll/directx/wine/d3dx9_26/d3dx9_26.rbuild +++ b/reactos/dll/directx/wine/d3dx9_26/d3dx9_26.rbuild @@ -11,7 +11,6 @@ user32 gdi32 advapi32 - wined3d d3dx9_26_main.c version.rc diff --git a/reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt index 595fb303814..974974657cc 100644 --- a/reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_27/CMakeLists.txt @@ -25,7 +25,6 @@ add_importlibs(d3dx9_27 user32 gdi32 advapi32 - wined3d msvcrt kernel32 ntdll) diff --git a/reactos/dll/directx/wine/d3dx9_27/d3dx9_27.rbuild b/reactos/dll/directx/wine/d3dx9_27/d3dx9_27.rbuild index daea575dc78..c0664299983 100644 --- a/reactos/dll/directx/wine/d3dx9_27/d3dx9_27.rbuild +++ b/reactos/dll/directx/wine/d3dx9_27/d3dx9_27.rbuild @@ -11,7 +11,6 @@ user32 gdi32 advapi32 - wined3d d3dx9_27_main.c version.rc diff --git a/reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt index 1abdaf0b692..5d34deb88b8 100644 --- a/reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_28/CMakeLists.txt @@ -25,7 +25,6 @@ add_importlibs(d3dx9_28 user32 gdi32 advapi32 - wined3d msvcrt kernel32 ntdll) diff --git a/reactos/dll/directx/wine/d3dx9_28/d3dx9_28.rbuild b/reactos/dll/directx/wine/d3dx9_28/d3dx9_28.rbuild index 79f53825d46..cb47d5f047d 100644 --- a/reactos/dll/directx/wine/d3dx9_28/d3dx9_28.rbuild +++ b/reactos/dll/directx/wine/d3dx9_28/d3dx9_28.rbuild @@ -11,7 +11,6 @@ user32 gdi32 advapi32 - wined3d d3dx9_28_main.c version.rc diff --git a/reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt index 431a7830835..e0d576f3b1f 100644 --- a/reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_29/CMakeLists.txt @@ -25,7 +25,6 @@ add_importlibs(d3dx9_29 user32 gdi32 advapi32 - wined3d msvcrt kernel32 ntdll) diff --git a/reactos/dll/directx/wine/d3dx9_29/d3dx9_29.rbuild b/reactos/dll/directx/wine/d3dx9_29/d3dx9_29.rbuild index 61898fcf4f5..d1c5e2ea161 100644 --- a/reactos/dll/directx/wine/d3dx9_29/d3dx9_29.rbuild +++ b/reactos/dll/directx/wine/d3dx9_29/d3dx9_29.rbuild @@ -11,7 +11,6 @@ user32 gdi32 advapi32 - wined3d d3dx9_29_main.c version.rc diff --git a/reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt index d6d00c81cf3..00ce311e881 100644 --- a/reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_30/CMakeLists.txt @@ -25,7 +25,6 @@ add_importlibs(d3dx9_30 user32 gdi32 advapi32 - wined3d msvcrt kernel32 ntdll) diff --git a/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.rbuild b/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.rbuild index e7c5eb68535..c47ef1c688e 100644 --- a/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.rbuild +++ b/reactos/dll/directx/wine/d3dx9_30/d3dx9_30.rbuild @@ -11,7 +11,6 @@ user32 gdi32 advapi32 - wined3d d3dx9_30_main.c version.rc diff --git a/reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt index aa45584de71..84ad7f4bff5 100644 --- a/reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_31/CMakeLists.txt @@ -24,7 +24,6 @@ add_importlibs(d3dx9_31 user32 gdi32 advapi32 - wined3d msvcrt kernel32 ntdll) diff --git a/reactos/dll/directx/wine/d3dx9_31/d3dx9_31.rbuild b/reactos/dll/directx/wine/d3dx9_31/d3dx9_31.rbuild index 86b91f21f86..01c2bc4fd1e 100644 --- a/reactos/dll/directx/wine/d3dx9_31/d3dx9_31.rbuild +++ b/reactos/dll/directx/wine/d3dx9_31/d3dx9_31.rbuild @@ -11,7 +11,6 @@ user32 gdi32 advapi32 - wined3d d3dx9_31_main.c version.rc diff --git a/reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt index 249e8195303..2daf736e121 100644 --- a/reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_32/CMakeLists.txt @@ -24,7 +24,6 @@ add_importlibs(d3dx9_32 user32 gdi32 advapi32 - wined3d msvcrt kernel32 ntdll) diff --git a/reactos/dll/directx/wine/d3dx9_32/d3dx9_32.rbuild b/reactos/dll/directx/wine/d3dx9_32/d3dx9_32.rbuild index f8bc87fa318..fd2dbeee065 100644 --- a/reactos/dll/directx/wine/d3dx9_32/d3dx9_32.rbuild +++ b/reactos/dll/directx/wine/d3dx9_32/d3dx9_32.rbuild @@ -11,7 +11,6 @@ user32 gdi32 advapi32 - wined3d d3dx9_32_main.c version.rc diff --git a/reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt index cefe373c27c..be87694c231 100644 --- a/reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_33/CMakeLists.txt @@ -24,7 +24,6 @@ add_importlibs(d3dx9_33 user32 gdi32 advapi32 - wined3d msvcrt kernel32 ntdll) diff --git a/reactos/dll/directx/wine/d3dx9_33/d3dx9_33.rbuild b/reactos/dll/directx/wine/d3dx9_33/d3dx9_33.rbuild index d45efae1f40..4c7ea881fc9 100644 --- a/reactos/dll/directx/wine/d3dx9_33/d3dx9_33.rbuild +++ b/reactos/dll/directx/wine/d3dx9_33/d3dx9_33.rbuild @@ -11,7 +11,6 @@ user32 gdi32 advapi32 - wined3d d3dx9_33_main.c version.rc diff --git a/reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt index 7353481b206..80ae9093171 100644 --- a/reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_34/CMakeLists.txt @@ -24,7 +24,6 @@ add_importlibs(d3dx9_34 user32 gdi32 advapi32 - wined3d msvcrt kernel32 ntdll) diff --git a/reactos/dll/directx/wine/d3dx9_34/d3dx9_34.rbuild b/reactos/dll/directx/wine/d3dx9_34/d3dx9_34.rbuild index 778d6adce91..b297ab1e7f9 100644 --- a/reactos/dll/directx/wine/d3dx9_34/d3dx9_34.rbuild +++ b/reactos/dll/directx/wine/d3dx9_34/d3dx9_34.rbuild @@ -11,7 +11,6 @@ user32 gdi32 advapi32 - wined3d d3dx9_34_main.c version.rc diff --git a/reactos/dll/directx/wine/d3dx9_35/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_35/CMakeLists.txt index 361ffa4671e..f71621388ab 100644 --- a/reactos/dll/directx/wine/d3dx9_35/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_35/CMakeLists.txt @@ -23,7 +23,6 @@ add_importlibs(d3dx9_35 user32 gdi32 advapi32 - wined3d msvcrt kernel32 ntdll) diff --git a/reactos/dll/directx/wine/d3dx9_35/d3dx9_35.rbuild b/reactos/dll/directx/wine/d3dx9_35/d3dx9_35.rbuild index 35bb8b42720..06087a6900d 100644 --- a/reactos/dll/directx/wine/d3dx9_35/d3dx9_35.rbuild +++ b/reactos/dll/directx/wine/d3dx9_35/d3dx9_35.rbuild @@ -11,7 +11,6 @@ user32 gdi32 advapi32 - wined3d d3dx9_35_main.c version.rc diff --git a/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt index 34ca20bf6a6..1d5c48876a9 100644 --- a/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_36/CMakeLists.txt @@ -32,7 +32,6 @@ add_importlibs(d3dx9_36 user32 gdi32 advapi32 - wined3d msvcrt kernel32 ntdll) diff --git a/reactos/dll/directx/wine/d3dx9_36/d3dx9_36.rbuild b/reactos/dll/directx/wine/d3dx9_36/d3dx9_36.rbuild index 52fc95074c7..b44f95fd57e 100644 --- a/reactos/dll/directx/wine/d3dx9_36/d3dx9_36.rbuild +++ b/reactos/dll/directx/wine/d3dx9_36/d3dx9_36.rbuild @@ -12,7 +12,6 @@ gdi32 advapi32 msvcrt - wined3d core.c d3dx9_36_main.c diff --git a/reactos/dll/directx/wine/d3dx9_37/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_37/CMakeLists.txt index cd49aee8e97..ac929e8263d 100644 --- a/reactos/dll/directx/wine/d3dx9_37/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_37/CMakeLists.txt @@ -23,7 +23,6 @@ add_importlibs(d3dx9_37 user32 gdi32 advapi32 - wined3d msvcrt kernel32 ntdll) diff --git a/reactos/dll/directx/wine/d3dx9_37/d3dx9_37.rbuild b/reactos/dll/directx/wine/d3dx9_37/d3dx9_37.rbuild index 56a701bd5d4..0d1ecddcc40 100644 --- a/reactos/dll/directx/wine/d3dx9_37/d3dx9_37.rbuild +++ b/reactos/dll/directx/wine/d3dx9_37/d3dx9_37.rbuild @@ -11,7 +11,6 @@ user32 gdi32 advapi32 - wined3d d3dx9_37_main.c version.rc diff --git a/reactos/dll/directx/wine/d3dx9_38/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_38/CMakeLists.txt index a5d8f25ac4a..9fccb7207cd 100644 --- a/reactos/dll/directx/wine/d3dx9_38/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_38/CMakeLists.txt @@ -23,7 +23,6 @@ add_importlibs(d3dx9_38 user32 gdi32 advapi32 - wined3d msvcrt kernel32 ntdll) diff --git a/reactos/dll/directx/wine/d3dx9_38/d3dx9_38.rbuild b/reactos/dll/directx/wine/d3dx9_38/d3dx9_38.rbuild index 1bf726c9928..14d4e0c4445 100644 --- a/reactos/dll/directx/wine/d3dx9_38/d3dx9_38.rbuild +++ b/reactos/dll/directx/wine/d3dx9_38/d3dx9_38.rbuild @@ -11,7 +11,6 @@ user32 gdi32 advapi32 - wined3d d3dx9_38_main.c version.rc diff --git a/reactos/dll/directx/wine/d3dx9_39/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_39/CMakeLists.txt index 84597ea257c..668b18dc006 100644 --- a/reactos/dll/directx/wine/d3dx9_39/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_39/CMakeLists.txt @@ -23,7 +23,6 @@ add_importlibs(d3dx9_39 user32 gdi32 advapi32 - wined3d msvcrt kernel32 ntdll) diff --git a/reactos/dll/directx/wine/d3dx9_39/d3dx9_39.rbuild b/reactos/dll/directx/wine/d3dx9_39/d3dx9_39.rbuild index 2b16c77c65e..9969cc2e96c 100644 --- a/reactos/dll/directx/wine/d3dx9_39/d3dx9_39.rbuild +++ b/reactos/dll/directx/wine/d3dx9_39/d3dx9_39.rbuild @@ -11,7 +11,6 @@ user32 gdi32 advapi32 - wined3d d3dx9_39_main.c version.rc diff --git a/reactos/dll/directx/wine/d3dx9_40/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_40/CMakeLists.txt index c9cfe0ae082..7c80c06f2cf 100644 --- a/reactos/dll/directx/wine/d3dx9_40/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_40/CMakeLists.txt @@ -23,7 +23,6 @@ add_importlibs(d3dx9_40 user32 gdi32 advapi32 - wined3d msvcrt kernel32 ntdll) diff --git a/reactos/dll/directx/wine/d3dx9_40/d3dx9_40.rbuild b/reactos/dll/directx/wine/d3dx9_40/d3dx9_40.rbuild index f6bb05dd6c4..478bcc82ff8 100644 --- a/reactos/dll/directx/wine/d3dx9_40/d3dx9_40.rbuild +++ b/reactos/dll/directx/wine/d3dx9_40/d3dx9_40.rbuild @@ -11,7 +11,6 @@ user32 gdi32 advapi32 - wined3d d3dx9_40_main.c version.rc diff --git a/reactos/dll/directx/wine/d3dx9_41/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_41/CMakeLists.txt index e8fbf0eeee0..4a6b5d5d73a 100644 --- a/reactos/dll/directx/wine/d3dx9_41/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_41/CMakeLists.txt @@ -23,7 +23,6 @@ add_importlibs(d3dx9_41 user32 gdi32 advapi32 - wined3d msvcrt kernel32 ntdll) diff --git a/reactos/dll/directx/wine/d3dx9_41/d3dx9_41.rbuild b/reactos/dll/directx/wine/d3dx9_41/d3dx9_41.rbuild index 386bc8b8fe9..bd4a36b010b 100644 --- a/reactos/dll/directx/wine/d3dx9_41/d3dx9_41.rbuild +++ b/reactos/dll/directx/wine/d3dx9_41/d3dx9_41.rbuild @@ -11,7 +11,6 @@ user32 gdi32 advapi32 - wined3d d3dx9_41_main.c version.rc diff --git a/reactos/dll/directx/wine/d3dx9_42/CMakeLists.txt b/reactos/dll/directx/wine/d3dx9_42/CMakeLists.txt index 75ee61b765d..0bcaa8ccb37 100644 --- a/reactos/dll/directx/wine/d3dx9_42/CMakeLists.txt +++ b/reactos/dll/directx/wine/d3dx9_42/CMakeLists.txt @@ -23,7 +23,6 @@ add_importlibs(d3dx9_42 user32 gdi32 advapi32 - wined3d msvcrt kernel32 ntdll) diff --git a/reactos/dll/directx/wine/d3dx9_42/d3dx9_42.rbuild b/reactos/dll/directx/wine/d3dx9_42/d3dx9_42.rbuild index d10af3a3b29..0cbf2df0a7d 100644 --- a/reactos/dll/directx/wine/d3dx9_42/d3dx9_42.rbuild +++ b/reactos/dll/directx/wine/d3dx9_42/d3dx9_42.rbuild @@ -11,7 +11,6 @@ user32 gdi32 advapi32 - wined3d d3dx9_42_main.c version.rc