Alexandre Julliard : vulkan-1: Use --prefer-native instead of DLL_WINE_PREATTACH.

Alexandre Julliard julliard at winehq.org
Fri Feb 19 17:20:09 CST 2021


Module: wine
Branch: master
Commit: 290c9a4d6372cee046768eccd8fa49050a294f68
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=290c9a4d6372cee046768eccd8fa49050a294f68

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Thu Feb 18 11:54:50 2021 +0100

vulkan-1: Use --prefer-native instead of DLL_WINE_PREATTACH.

Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/vulkan-1/Makefile.in |  5 +----
 dlls/vulkan-1/vulkan.c    | 44 --------------------------------------------
 2 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/dlls/vulkan-1/Makefile.in b/dlls/vulkan-1/Makefile.in
index 0ec2877c692..a4a10bc8e93 100644
--- a/dlls/vulkan-1/Makefile.in
+++ b/dlls/vulkan-1/Makefile.in
@@ -2,9 +2,6 @@ MODULE    = vulkan-1.dll
 IMPORTS   = winevulkan
 IMPORTLIB = vulkan-1
 
-EXTRADLLFLAGS = -mno-cygwin
-
-C_SRCS = \
-	vulkan.c
+EXTRADLLFLAGS = -Wb,--prefer-native
 
 RC_SRCS = version.rc
diff --git a/dlls/vulkan-1/vulkan.c b/dlls/vulkan-1/vulkan.c
deleted file mode 100644
index d3b35603a17..00000000000
--- a/dlls/vulkan-1/vulkan.c
+++ /dev/null
@@ -1,44 +0,0 @@
-/* Wine Vulkan loader implementation
- *
- * Copyright 2018 Roderick Colenbrander
- *
- * 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 "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(vulkan);
-
-BOOL WINAPI DllMain(HINSTANCE hinst, DWORD reason, void *reserved)
-{
-    TRACE("%p, %u, %p\n", hinst, reason, reserved);
-
-    switch (reason)
-    {
-        case DLL_WINE_PREATTACH:
-            /* Prefer native as it provides more functionality. */
-            return FALSE;
-
-        case DLL_PROCESS_ATTACH:
-            DisableThreadLibraryCalls(hinst);
-            return TRUE;
-    }
-    return TRUE;
-}




More information about the wine-cvs mailing list