Title: [184505] releases/WebKitGTK/webkit-2.4
- Revision
- 184505
- Author
- [email protected]
- Date
- 2015-05-18 11:44:16 -0700 (Mon, 18 May 2015)
Log Message
[W32] Wrong configure tests for OpenGL on Windows, wrong ifdefs
https://bugs.webkit.org/show_bug.cgi?id=143763
Patch by Руслан Ижбулатов <[email protected]> on 2015-04-15
Reviewed by Carlos Garcia Campos.
Change OpenGL checks to work on W32, add libopengl32
AGain, use OS(WINDOWS) for things that are W32 but not necessarily MSVC.
Don't try to check for dlopen() on W32 (it might be available, but
native code is already here, so use it).
Correctly cast the result of GetProcAddress(), because C++.
Link W32 version to -lOpenGL32 instead of -lGL, otherwise libtool complains:
*** Warning: linker path does not have real file for library -lGL.
.:
* Source/autotools/FindDependencies.m4:
Source/WebCore:
* platform/graphics/OpenGLShims.cpp:
(WebCore::getProcAddress):
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/ChangeLog (184504 => 184505)
--- releases/WebKitGTK/webkit-2.4/ChangeLog 2015-05-18 18:24:28 UTC (rev 184504)
+++ releases/WebKitGTK/webkit-2.4/ChangeLog 2015-05-18 18:44:16 UTC (rev 184505)
@@ -1,5 +1,25 @@
2015-04-15 Руслан Ижбулатов <[email protected]>
+ [W32] Wrong configure tests for OpenGL on Windows, wrong ifdefs
+ https://bugs.webkit.org/show_bug.cgi?id=143763
+
+ Reviewed by Carlos Garcia Campos.
+
+ Change OpenGL checks to work on W32, add libopengl32
+
+ AGain, use OS(WINDOWS) for things that are W32 but not necessarily MSVC.
+ Don't try to check for dlopen() on W32 (it might be available, but
+ native code is already here, so use it).
+
+ Correctly cast the result of GetProcAddress(), because C++.
+
+ Link W32 version to -lOpenGL32 instead of -lGL, otherwise libtool complains:
+ *** Warning: linker path does not have real file for library -lGL.
+
+ * Source/autotools/FindDependencies.m4:
+
+2015-04-15 Руслан Ижбулатов <[email protected]>
+
[W32] Configure may misdetect ICU libraries
https://bugs.webkit.org/show_bug.cgi?id=143767
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (184504 => 184505)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-05-18 18:24:28 UTC (rev 184504)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-05-18 18:44:16 UTC (rev 184505)
@@ -1,5 +1,26 @@
2015-04-15 Руслан Ижбулатов <[email protected]>
+ [W32] Wrong configure tests for OpenGL on Windows, wrong ifdefs
+ https://bugs.webkit.org/show_bug.cgi?id=143763
+
+ Reviewed by Carlos Garcia Campos.
+
+ Change OpenGL checks to work on W32, add libopengl32
+
+ AGain, use OS(WINDOWS) for things that are W32 but not necessarily MSVC.
+ Don't try to check for dlopen() on W32 (it might be available, but
+ native code is already here, so use it).
+
+ Correctly cast the result of GetProcAddress(), because C++.
+
+ Link W32 version to -lOpenGL32 instead of -lGL, otherwise libtool complains:
+ *** Warning: linker path does not have real file for library -lGL.
+
+ * platform/graphics/OpenGLShims.cpp:
+ (WebCore::getProcAddress):
+
+2015-04-15 Руслан Ижбулатов <[email protected]>
+
[W32] windowsVersion() and osVersionForUAString() are outdated
https://bugs.webkit.org/show_bug.cgi?id=143771
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/OpenGLShims.cpp (184504 => 184505)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/OpenGLShims.cpp 2015-05-18 18:24:28 UTC (rev 184504)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/platform/graphics/OpenGLShims.cpp 2015-05-18 18:44:16 UTC (rev 184505)
@@ -22,7 +22,7 @@
#define DISABLE_SHIMS
#include "OpenGLShims.h"
-#if !PLATFORM(WIN)
+#if !OS(WINDOWS)
#include <dlfcn.h>
#endif
@@ -37,10 +37,10 @@
return &table;
}
-#if PLATFORM(WIN)
+#if OS(WINDOWS)
static void* getProcAddress(const char* procName)
{
- return GetProcAddress(GetModuleHandleA("libGLESv2"), procName);
+ return reinterpret_cast<void*>(GetProcAddress(GetModuleHandleA("libGLESv2"), procName));
}
#else
typedef void* (*glGetProcAddressType) (const char* procName);
Modified: releases/WebKitGTK/webkit-2.4/Source/autotools/FindDependencies.m4 (184504 => 184505)
--- releases/WebKitGTK/webkit-2.4/Source/autotools/FindDependencies.m4 2015-05-18 18:24:28 UTC (rev 184504)
+++ releases/WebKitGTK/webkit-2.4/Source/autotools/FindDependencies.m4 2015-05-18 18:44:16 UTC (rev 184505)
@@ -459,6 +459,9 @@
if test "$enable_gles2" = "yes"; then
acceleration_description="$acceleration_description (gles2"
OPENGL_LIBS="-lGLESv2"
+ elif test "$os_win32" = "yes"; then
+ acceleration_description="$acceleration_description (gl"
+ OPENGL_LIBS="-lopengl32"
else
acceleration_description="$acceleration_description (gl"
OPENGL_LIBS="-lGL"
@@ -473,7 +476,9 @@
# Check whether dlopen() is in the core libc like on FreeBSD, or in a separate
# libdl like on GNU/Linux (in which case we want to link to libdl).
- AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [OPENGL_LIBS="$OPENGL_LIBS -ldl"])])
+ if test "$os_win32" = "no"; then
+ AC_CHECK_FUNC([dlopen], [], [AC_CHECK_LIB([dl], [dlopen], [OPENGL_LIBS="$OPENGL_LIBS -ldl"])])
+ fi
acceleration_description="$acceleration_description)"
fi
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
