Title: [184544] releases/WebKitGTK/webkit-2.4/Source/WebCore
- Revision
- 184544
- Author
- [email protected]
- Date
- 2015-05-18 23:05:16 -0700 (Mon, 18 May 2015)
Log Message
[W32] Fails to build - missing references to OpenGL context functions
https://bugs.webkit.org/show_bug.cgi?id=143769
Patch by Руслан Ижбулатов <[email protected]> on 2015-04-15
Reviewed by Carlos Garcia Campos.
Also use GL-related files when compiling with MinGW
CXXLD libwebkitgtk-3.0.la
./.libs/../source/webcore/platform/graphics/.libs/libplatform_la-graphicscontext3dprivate.o: In function `GraphicsContext3DPrivate':
/src/mingw/webkitgtk-2.4.8-1\bld/../webkitgtk-2.4.8/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp:59: undefined reference to `__ZN7WebCore9GLContext14sharingContextEv'
/src/mingw/webkitgtk-2.4.8-1\bld/../webkitgtk-2.4.8/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp:59: undefined reference to `__ZN7WebCore9GLContext22createOffscreenContextEPS0_'
./.libs/../source/webcore/platform/graphics/.libs/libplatform_la-graphicscontext3dprivate.o: In function `platformContext':
/src/mingw/webkitgtk-2.4.8-1\bld/../webkitgtk-2.4.8/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp:84: undefined reference to `__ZN7WebCore9GLContext10getCurrentEv'
Becuase GLContext.cpp is not used, which happens because it's
under TARGET_X11_OR_WAYLAND condition in the GNUmakefile.list.am.
Move TARGET_X11_OR_WAYLAND up a bit to free up GLContext.cpp (now
only protected by USE_OPENGL).
* GNUmakefile.list.am:
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog (184543 => 184544)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-05-19 05:55:22 UTC (rev 184543)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog 2015-05-19 06:05:16 UTC (rev 184544)
@@ -1,5 +1,27 @@
2015-04-15 Руслан Ижбулатов <[email protected]>
+ [W32] Fails to build - missing references to OpenGL context functions
+ https://bugs.webkit.org/show_bug.cgi?id=143769
+
+ Reviewed by Carlos Garcia Campos.
+
+ Also use GL-related files when compiling with MinGW
+ CXXLD libwebkitgtk-3.0.la
+ ./.libs/../source/webcore/platform/graphics/.libs/libplatform_la-graphicscontext3dprivate.o: In function `GraphicsContext3DPrivate':
+ /src/mingw/webkitgtk-2.4.8-1\bld/../webkitgtk-2.4.8/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp:59: undefined reference to `__ZN7WebCore9GLContext14sharingContextEv'
+ /src/mingw/webkitgtk-2.4.8-1\bld/../webkitgtk-2.4.8/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp:59: undefined reference to `__ZN7WebCore9GLContext22createOffscreenContextEPS0_'
+ ./.libs/../source/webcore/platform/graphics/.libs/libplatform_la-graphicscontext3dprivate.o: In function `platformContext':
+ /src/mingw/webkitgtk-2.4.8-1\bld/../webkitgtk-2.4.8/Source/WebCore/platform/graphics/GraphicsContext3DPrivate.cpp:84: undefined reference to `__ZN7WebCore9GLContext10getCurrentEv'
+
+ Becuase GLContext.cpp is not used, which happens because it's
+ under TARGET_X11_OR_WAYLAND condition in the GNUmakefile.list.am.
+ Move TARGET_X11_OR_WAYLAND up a bit to free up GLContext.cpp (now
+ only protected by USE_OPENGL).
+
+ * GNUmakefile.list.am:
+
+2015-04-15 Руслан Ижбулатов <[email protected]>
+
[W32] Wrong configure tests for OpenGL on Windows, wrong ifdefs
https://bugs.webkit.org/show_bug.cgi?id=143763
Modified: releases/WebKitGTK/webkit-2.4/Source/WebCore/GNUmakefile.list.am (184543 => 184544)
--- releases/WebKitGTK/webkit-2.4/Source/WebCore/GNUmakefile.list.am 2015-05-19 05:55:22 UTC (rev 184543)
+++ releases/WebKitGTK/webkit-2.4/Source/WebCore/GNUmakefile.list.am 2015-05-19 06:05:16 UTC (rev 184544)
@@ -6246,6 +6246,11 @@
platformgtk_sources += \
Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.h \
Source/WebCore/platform/gtk/WidgetBackingStoreGtkX11.cpp
+if USE_OPENGL
+platformgtk_sources += \
+ Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp \
+ Source/WebCore/platform/gtk/RedirectedXCompositeWindow.h
+endif # END USE_OPENGL
if USE_GLX
webcoregtk_sources += \
Source/WebCore/platform/graphics/glx/GLContextGLX.cpp \
@@ -6267,19 +6272,19 @@
platformgtk_sources += \
Source/WebCore/platform/cairo/WidgetBackingStoreCairo.h \
Source/WebCore/platform/cairo/WidgetBackingStoreCairo.cpp
+endif # END TARGET_X11_OR_WAYLAND
+
if USE_OPENGL
platformgtk_sources += \
Source/WebCore/platform/graphics/GLContext.cpp \
- Source/WebCore/platform/graphics/GLContext.h \
- Source/WebCore/platform/gtk/RedirectedXCompositeWindow.cpp \
- Source/WebCore/platform/gtk/RedirectedXCompositeWindow.h
+ Source/WebCore/platform/graphics/GLContext.h
endif # END USE_OPENGL
+
if USE_EGL
webcoregtk_sources += \
Source/WebCore/platform/graphics/egl/GLContextEGL.cpp \
Source/WebCore/platform/graphics/egl/GLContextEGL.h
endif # END USE_EGL
-endif # END TARGET_X11_OR_WAYLAND
if TARGET_WIN32
webcore_sources += \
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
