d3dx9: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
0fee3fc46f
commit
64bdb9808f
|
@ -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 \
|
||||||
|
|
|
@ -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 \
|
||||||
|
|
|
@ -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 \
|
||||||
|
|
|
@ -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 \
|
||||||
|
|
|
@ -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 \
|
||||||
|
|
|
@ -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 \
|
||||||
|
|
|
@ -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 \
|
||||||
|
|
|
@ -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 \
|
||||||
|
|
|
@ -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 \
|
||||||
|
|
|
@ -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 \
|
||||||
|
|
|
@ -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 \
|
||||||
|
|
|
@ -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 \
|
||||||
|
|
|
@ -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 \
|
||||||
|
|
|
@ -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;
|
||||||
|
|
|
@ -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 \
|
||||||
|
|
|
@ -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 \
|
||||||
|
|
|
@ -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 \
|
||||||
|
|
|
@ -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 \
|
||||||
|
|
|
@ -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 \
|
||||||
|
|
|
@ -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 \
|
||||||
|
|
|
@ -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 \
|
||||||
|
|
Loading…
Reference in New Issue