Changeset 184544 in webkit

Timestamp:

May 18, 2015, 11:05:16 PM (10 years ago)

Author:

Carlos Garcia Campos

Message:

[W32] Fails to build - missing references to OpenGL context functions
​https://bugs.webkit.org/show_bug.cgi?id=143769

Patch by Руслан Ижбулатов <​lrn1986@gmail.com> 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:

Location:

releases/WebKitGTK/webkit-2.4/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• GNUmakefile.list.am (modified) (3 diffs)

releases/WebKitGTK/webkit-2.4/Source/WebCore/ChangeLog

@@ +1 @@
+2015-04-15  Руслан Ижбулатов  <lrn1986@gmail.com>
+
+        [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  Руслан Ижбулатов  <lrn1986@gmail.com>
 

releases/WebKitGTK/webkit-2.4/Source/WebCore/GNUmakefile.list.am

@@ -6247 +6247 @@
         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 += \
@@ -6268 +6273 @@
         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 += \
@@ -6280 +6286 @@
         Source/WebCore/platform/graphics/egl/GLContextEGL.h
 endif # END USE_EGL
-endif # END TARGET_X11_OR_WAYLAND
 
 if TARGET_WIN32