Alexandre Julliard : d3dcompiler: Use --prefer-native instead of DLL_WINE_PREATTACH.
Alexandre Julliard
julliard at winehq.org
Thu Feb 18 16:06:06 CST 2021
Module: wine
Branch: master
Commit: 0b22f87be68a5d3608bbc9e9bbbe1a1a6c1788f7
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b22f87be68a5d3608bbc9e9bbbe1a1a6c1788f7
Author: Alexandre Julliard <julliard at winehq.org>
Date: Thu Feb 18 11:42:33 2021 +0100
d3dcompiler: Use --prefer-native instead of DLL_WINE_PREATTACH.
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3dcompiler_33/Makefile.in | 3 +--
dlls/d3dcompiler_34/Makefile.in | 3 +--
dlls/d3dcompiler_35/Makefile.in | 3 +--
dlls/d3dcompiler_36/Makefile.in | 3 +--
dlls/d3dcompiler_37/Makefile.in | 3 +--
dlls/d3dcompiler_38/Makefile.in | 3 +--
dlls/d3dcompiler_39/Makefile.in | 3 +--
dlls/d3dcompiler_40/Makefile.in | 3 +--
dlls/d3dcompiler_41/Makefile.in | 3 +--
dlls/d3dcompiler_42/Makefile.in | 3 +--
dlls/d3dcompiler_43/Makefile.in | 3 +--
dlls/d3dcompiler_43/main.c | 40 ----------------------------------------
dlls/d3dcompiler_46/Makefile.in | 3 +--
dlls/d3dcompiler_47/Makefile.in | 3 +--
14 files changed, 13 insertions(+), 66 deletions(-)
diff --git a/dlls/d3dcompiler_33/Makefile.in b/dlls/d3dcompiler_33/Makefile.in
index 926f38d8745..2c0460ea0a4 100644
--- a/dlls/d3dcompiler_33/Makefile.in
+++ b/dlls/d3dcompiler_33/Makefile.in
@@ -3,14 +3,13 @@ IMPORTS = dxguid uuid
EXTRADEFS = -DD3D_COMPILER_VERSION=33
PARENTSRC = ../d3dcompiler_43
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
asmparser.c \
blob.c \
bytecodewriter.c \
compiler.c \
- main.c \
preproc.c \
reflection.c \
utils.c
diff --git a/dlls/d3dcompiler_34/Makefile.in b/dlls/d3dcompiler_34/Makefile.in
index cf8dc1112ea..b342df17677 100644
--- a/dlls/d3dcompiler_34/Makefile.in
+++ b/dlls/d3dcompiler_34/Makefile.in
@@ -3,14 +3,13 @@ IMPORTS = dxguid uuid
EXTRADEFS = -DD3D_COMPILER_VERSION=34
PARENTSRC = ../d3dcompiler_43
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
asmparser.c \
blob.c \
bytecodewriter.c \
compiler.c \
- main.c \
preproc.c \
reflection.c \
utils.c
diff --git a/dlls/d3dcompiler_35/Makefile.in b/dlls/d3dcompiler_35/Makefile.in
index 07bae8f801d..43e76ea4a5e 100644
--- a/dlls/d3dcompiler_35/Makefile.in
+++ b/dlls/d3dcompiler_35/Makefile.in
@@ -3,14 +3,13 @@ IMPORTS = dxguid uuid
EXTRADEFS = -DD3D_COMPILER_VERSION=35
PARENTSRC = ../d3dcompiler_43
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
asmparser.c \
blob.c \
bytecodewriter.c \
compiler.c \
- main.c \
preproc.c \
reflection.c \
utils.c
diff --git a/dlls/d3dcompiler_36/Makefile.in b/dlls/d3dcompiler_36/Makefile.in
index a654b7a7cf0..a7f1d2fef8b 100644
--- a/dlls/d3dcompiler_36/Makefile.in
+++ b/dlls/d3dcompiler_36/Makefile.in
@@ -3,14 +3,13 @@ IMPORTS = dxguid uuid
EXTRADEFS = -DD3D_COMPILER_VERSION=36
PARENTSRC = ../d3dcompiler_43
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
asmparser.c \
blob.c \
bytecodewriter.c \
compiler.c \
- main.c \
preproc.c \
reflection.c \
utils.c
diff --git a/dlls/d3dcompiler_37/Makefile.in b/dlls/d3dcompiler_37/Makefile.in
index 8dfb36fdf89..898e1b0e52e 100644
--- a/dlls/d3dcompiler_37/Makefile.in
+++ b/dlls/d3dcompiler_37/Makefile.in
@@ -3,14 +3,13 @@ IMPORTS = dxguid uuid
EXTRADEFS = -DD3D_COMPILER_VERSION=37
PARENTSRC = ../d3dcompiler_43
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
asmparser.c \
blob.c \
bytecodewriter.c \
compiler.c \
- main.c \
preproc.c \
reflection.c \
utils.c
diff --git a/dlls/d3dcompiler_38/Makefile.in b/dlls/d3dcompiler_38/Makefile.in
index 6042b0d4706..7c8f996db74 100644
--- a/dlls/d3dcompiler_38/Makefile.in
+++ b/dlls/d3dcompiler_38/Makefile.in
@@ -3,14 +3,13 @@ IMPORTS = dxguid uuid
EXTRADEFS = -DD3D_COMPILER_VERSION=38
PARENTSRC = ../d3dcompiler_43
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
asmparser.c \
blob.c \
bytecodewriter.c \
compiler.c \
- main.c \
preproc.c \
reflection.c \
utils.c
diff --git a/dlls/d3dcompiler_39/Makefile.in b/dlls/d3dcompiler_39/Makefile.in
index 9690d08793c..c0672d72a33 100644
--- a/dlls/d3dcompiler_39/Makefile.in
+++ b/dlls/d3dcompiler_39/Makefile.in
@@ -3,14 +3,13 @@ IMPORTS = dxguid uuid
EXTRADEFS = -DD3D_COMPILER_VERSION=39
PARENTSRC = ../d3dcompiler_43
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
asmparser.c \
blob.c \
bytecodewriter.c \
compiler.c \
- main.c \
preproc.c \
reflection.c \
utils.c
diff --git a/dlls/d3dcompiler_40/Makefile.in b/dlls/d3dcompiler_40/Makefile.in
index 46cd563793b..bb8e3387066 100644
--- a/dlls/d3dcompiler_40/Makefile.in
+++ b/dlls/d3dcompiler_40/Makefile.in
@@ -3,14 +3,13 @@ IMPORTS = dxguid uuid
EXTRADEFS = -DD3D_COMPILER_VERSION=40
PARENTSRC = ../d3dcompiler_43
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
asmparser.c \
blob.c \
bytecodewriter.c \
compiler.c \
- main.c \
preproc.c \
reflection.c \
utils.c
diff --git a/dlls/d3dcompiler_41/Makefile.in b/dlls/d3dcompiler_41/Makefile.in
index f19e1392113..dd72016c0b9 100644
--- a/dlls/d3dcompiler_41/Makefile.in
+++ b/dlls/d3dcompiler_41/Makefile.in
@@ -3,14 +3,13 @@ IMPORTS = dxguid uuid
EXTRADEFS = -DD3D_COMPILER_VERSION=41
PARENTSRC = ../d3dcompiler_43
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
asmparser.c \
blob.c \
bytecodewriter.c \
compiler.c \
- main.c \
preproc.c \
reflection.c \
utils.c
diff --git a/dlls/d3dcompiler_42/Makefile.in b/dlls/d3dcompiler_42/Makefile.in
index 25a02dcbcea..938be9afb4f 100644
--- a/dlls/d3dcompiler_42/Makefile.in
+++ b/dlls/d3dcompiler_42/Makefile.in
@@ -3,14 +3,13 @@ IMPORTS = dxguid uuid
EXTRADEFS = -DD3D_COMPILER_VERSION=42
PARENTSRC = ../d3dcompiler_43
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
asmparser.c \
blob.c \
bytecodewriter.c \
compiler.c \
- main.c \
preproc.c \
reflection.c \
utils.c
diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in
index 8464113cd15..58a17aa6ac4 100644
--- a/dlls/d3dcompiler_43/Makefile.in
+++ b/dlls/d3dcompiler_43/Makefile.in
@@ -1,14 +1,13 @@
MODULE = d3dcompiler_43.dll
EXTRADEFS = -DD3D_COMPILER_VERSION=43
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
asmparser.c \
blob.c \
bytecodewriter.c \
compiler.c \
- main.c \
preproc.c \
reflection.c \
utils.c
diff --git a/dlls/d3dcompiler_43/main.c b/dlls/d3dcompiler_43/main.c
deleted file mode 100644
index 3404655ac8e..00000000000
--- a/dlls/d3dcompiler_43/main.c
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Direct3D shader compiler main file
- *
- * Copyright 2010 Matteo Bruni for CodeWeavers
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- *
- */
-
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-
-#include "d3dcompiler_private.h"
-
-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;
-}
diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in
index 6f32986af1e..24c9acfc014 100644
--- a/dlls/d3dcompiler_46/Makefile.in
+++ b/dlls/d3dcompiler_46/Makefile.in
@@ -3,14 +3,13 @@ IMPORTS = dxguid uuid
EXTRADEFS = -DD3D_COMPILER_VERSION=46
PARENTSRC = ../d3dcompiler_43
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
asmparser.c \
blob.c \
bytecodewriter.c \
compiler.c \
- main.c \
preproc.c \
reflection.c \
utils.c
diff --git a/dlls/d3dcompiler_47/Makefile.in b/dlls/d3dcompiler_47/Makefile.in
index df9cde05ca9..44bec38d8d2 100644
--- a/dlls/d3dcompiler_47/Makefile.in
+++ b/dlls/d3dcompiler_47/Makefile.in
@@ -4,14 +4,13 @@ IMPORTS = dxguid uuid
EXTRADEFS = -DD3D_COMPILER_VERSION=47
PARENTSRC = ../d3dcompiler_43
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
C_SRCS = \
asmparser.c \
blob.c \
bytecodewriter.c \
compiler.c \
- main.c \
preproc.c \
reflection.c \
utils.c
More information about the wine-cvs
mailing list