Skip to content

W
wine-winehq
Commit 64bdb980 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

d3dx9: Use --prefer-native instead of DLL_WINE_PREATTACH.

Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 0fee3fc4
Show whitespace changes
Inline Side-by-side
Showing with 20 additions and 33 deletions
dlls/d3dx9_24/Makefile.in
View file @ 64bdb980
...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36 PARENTSRC = ../d3dx9_36
DELAYIMPORTS = windowscodecs usp10 DELAYIMPORTS = windowscodecs usp10
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ C_SRCS = \
animation.c \ animation.c \
......
dlls/d3dx9_25/Makefile.in
View file @ 64bdb980
...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36 PARENTSRC = ../d3dx9_36
DELAYIMPORTS = windowscodecs usp10 DELAYIMPORTS = windowscodecs usp10
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ C_SRCS = \
animation.c \ animation.c \
......
dlls/d3dx9_26/Makefile.in
View file @ 64bdb980
...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36 PARENTSRC = ../d3dx9_36
DELAYIMPORTS = windowscodecs usp10 DELAYIMPORTS = windowscodecs usp10
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ C_SRCS = \
animation.c \ animation.c \
......
dlls/d3dx9_27/Makefile.in
View file @ 64bdb980
...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36 PARENTSRC = ../d3dx9_36
DELAYIMPORTS = windowscodecs usp10 DELAYIMPORTS = windowscodecs usp10
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ C_SRCS = \
animation.c \ animation.c \
......
dlls/d3dx9_28/Makefile.in
View file @ 64bdb980
...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36 PARENTSRC = ../d3dx9_36
DELAYIMPORTS = windowscodecs usp10 DELAYIMPORTS = windowscodecs usp10
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ C_SRCS = \
animation.c \ animation.c \
......
dlls/d3dx9_29/Makefile.in
View file @ 64bdb980
...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36 PARENTSRC = ../d3dx9_36
DELAYIMPORTS = windowscodecs usp10 DELAYIMPORTS = windowscodecs usp10
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ C_SRCS = \
animation.c \ animation.c \
......
dlls/d3dx9_30/Makefile.in
View file @ 64bdb980
...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36 PARENTSRC = ../d3dx9_36
DELAYIMPORTS = windowscodecs usp10 DELAYIMPORTS = windowscodecs usp10
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ C_SRCS = \
animation.c \ animation.c \
......
dlls/d3dx9_31/Makefile.in
View file @ 64bdb980
...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36 PARENTSRC = ../d3dx9_36
DELAYIMPORTS = windowscodecs usp10 DELAYIMPORTS = windowscodecs usp10
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ C_SRCS = \
animation.c \ animation.c \
......
dlls/d3dx9_32/Makefile.in
View file @ 64bdb980
...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36 PARENTSRC = ../d3dx9_36
DELAYIMPORTS = windowscodecs usp10 DELAYIMPORTS = windowscodecs usp10
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ C_SRCS = \
animation.c \ animation.c \
......
dlls/d3dx9_33/Makefile.in
View file @ 64bdb980
...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36 PARENTSRC = ../d3dx9_36
DELAYIMPORTS = windowscodecs usp10 DELAYIMPORTS = windowscodecs usp10
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ C_SRCS = \
animation.c \ animation.c \
......
dlls/d3dx9_34/Makefile.in
View file @ 64bdb980
...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36 PARENTSRC = ../d3dx9_36
DELAYIMPORTS = windowscodecs usp10 DELAYIMPORTS = windowscodecs usp10
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ C_SRCS = \
animation.c \ animation.c \
......
dlls/d3dx9_35/Makefile.in
View file @ 64bdb980
...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36 PARENTSRC = ../d3dx9_36
DELAYIMPORTS = windowscodecs usp10 DELAYIMPORTS = windowscodecs usp10
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ C_SRCS = \
animation.c \ animation.c \
......
dlls/d3dx9_36/Makefile.in
View file @ 64bdb980
...@@ -4,7 +4,7 @@ IMPORTLIB = d3dx9 ...@@ -4,7 +4,7 @@ IMPORTLIB = d3dx9
IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
DELAYIMPORTS = windowscodecs usp10 DELAYIMPORTS = windowscodecs usp10
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ C_SRCS = \
animation.c \ animation.c \
......
dlls/d3dx9_36/main.c
View file @ 64bdb980
...@@ -26,19 +26,6 @@ ...@@ -26,19 +26,6 @@
WINE_DEFAULT_DEBUG_CHANNEL(d3dx); WINE_DEFAULT_DEBUG_CHANNEL(d3dx);
BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved)
{
switch(reason)
{
case DLL_WINE_PREATTACH:
return FALSE; /* prefer native version */
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(inst);
break;
}
return TRUE;
}
BOOL WINAPI D3DXCheckVersion(UINT d3d_sdk_ver, UINT d3dx_sdk_ver) BOOL WINAPI D3DXCheckVersion(UINT d3d_sdk_ver, UINT d3dx_sdk_ver)
{ {
return d3d_sdk_ver == D3D_SDK_VERSION && d3dx_sdk_ver == D3DX_SDK_VERSION; return d3d_sdk_ver == D3D_SDK_VERSION && d3dx_sdk_ver == D3DX_SDK_VERSION;
......
dlls/d3dx9_37/Makefile.in
View file @ 64bdb980
...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36 PARENTSRC = ../d3dx9_36
DELAYIMPORTS = windowscodecs usp10 DELAYIMPORTS = windowscodecs usp10
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ C_SRCS = \
animation.c \ animation.c \
......
dlls/d3dx9_38/Makefile.in
View file @ 64bdb980
...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36 PARENTSRC = ../d3dx9_36
DELAYIMPORTS = windowscodecs usp10 DELAYIMPORTS = windowscodecs usp10
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ C_SRCS = \
animation.c \ animation.c \
......
dlls/d3dx9_39/Makefile.in
View file @ 64bdb980
...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36 PARENTSRC = ../d3dx9_36
DELAYIMPORTS = windowscodecs usp10 DELAYIMPORTS = windowscodecs usp10
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ C_SRCS = \
animation.c \ animation.c \
......
dlls/d3dx9_40/Makefile.in
View file @ 64bdb980
...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36 PARENTSRC = ../d3dx9_36
DELAYIMPORTS = windowscodecs usp10 DELAYIMPORTS = windowscodecs usp10
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ C_SRCS = \
animation.c \ animation.c \
......
dlls/d3dx9_41/Makefile.in
View file @ 64bdb980
...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36 PARENTSRC = ../d3dx9_36
DELAYIMPORTS = windowscodecs usp10 DELAYIMPORTS = windowscodecs usp10
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ C_SRCS = \
animation.c \ animation.c \
......
dlls/d3dx9_42/Makefile.in
View file @ 64bdb980
...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36 PARENTSRC = ../d3dx9_36
DELAYIMPORTS = windowscodecs usp10 DELAYIMPORTS = windowscodecs usp10
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ C_SRCS = \
animation.c \ animation.c \
......
dlls/d3dx9_43/Makefile.in
View file @ 64bdb980
...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32 ...@@ -4,7 +4,7 @@ IMPORTS = d3d9 d3dcompiler dxguid d3dxof ole32 gdi32 user32
PARENTSRC = ../d3dx9_36 PARENTSRC = ../d3dx9_36
DELAYIMPORTS = windowscodecs usp10 DELAYIMPORTS = windowscodecs usp10
EXTRADLLFLAGS = -mno-cygwin EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \ C_SRCS = \
animation.c \ animation.c \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment