Alexandre Julliard : glu32: Use --prefer-native instead of DLL_WINE_PREATTACH.

Alexandre Julliard julliard at winehq.org
Tue Feb 23 15:54:46 CST 2021


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

Author: Alexandre Julliard <julliard at winehq.org>
Date:   Tue Feb 23 10:06:01 2021 +0100

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

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

---

 dlls/glu32/Makefile.in |  2 +-
 dlls/glu32/glu.c       | 16 ----------------
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/dlls/glu32/Makefile.in b/dlls/glu32/Makefile.in
index 587191229f8..45bf40dee38 100644
--- a/dlls/glu32/Makefile.in
+++ b/dlls/glu32/Makefile.in
@@ -2,7 +2,7 @@ MODULE    = glu32.dll
 IMPORTLIB = glu32
 IMPORTS   = opengl32
 
-EXTRADLLFLAGS = -mno-cygwin
+EXTRADLLFLAGS = -mno-cygwin -Wb,--prefer-native
 
 C_SRCS = \
 	geom.c \
diff --git a/dlls/glu32/glu.c b/dlls/glu32/glu.c
index 9305b90d308..8b045ea4438 100644
--- a/dlls/glu32/glu.c
+++ b/dlls/glu32/glu.c
@@ -276,19 +276,3 @@ GLboolean WINAPI wine_gluCheckExtension( const GLubyte *extName, const GLubyte *
     }
     return GLU_FALSE;
 }
-
-/***********************************************************************
- *		DllMain
- */
-BOOL WINAPI DllMain( HINSTANCE instance, DWORD reason, LPVOID reserved )
-{
-    switch (reason)
-    {
-        case DLL_WINE_PREATTACH:
-            return FALSE;    /* prefer native version */
-        case DLL_PROCESS_ATTACH:
-            DisableThreadLibraryCalls( instance );
-            break;
-    }
-    return TRUE;
-}




More information about the wine-cvs mailing list