Title: [96295] trunk
- Revision
- 96295
- Author
- [email protected]
- Date
- 2011-09-28 21:48:58 -0700 (Wed, 28 Sep 2011)
Log Message
.: Fix the WebKit2 WebGL build.
* configure.ac: Add -ldl to the OPENGL_LIBS.
Source/WebKit2: Fix the WebGL build on WebKit2 GTK+.
* GNUmakefile.am: Add OPENGL_LIBS to WebKit2 targets.
Modified Paths
Diff
Modified: trunk/ChangeLog (96294 => 96295)
--- trunk/ChangeLog 2011-09-29 04:12:42 UTC (rev 96294)
+++ trunk/ChangeLog 2011-09-29 04:48:58 UTC (rev 96295)
@@ -1,3 +1,9 @@
+2011-09-28 Martin Robinson <[email protected]>
+
+ Fix the WebKit2 WebGL build.
+
+ * configure.ac: Add -ldl to the OPENGL_LIBS.
+
2011-09-28 Ryuan Choi <[email protected]>
[EFL] Bump minimum requirement for eina.
Modified: trunk/Source/WebKit2/ChangeLog (96294 => 96295)
--- trunk/Source/WebKit2/ChangeLog 2011-09-29 04:12:42 UTC (rev 96294)
+++ trunk/Source/WebKit2/ChangeLog 2011-09-29 04:48:58 UTC (rev 96295)
@@ -1,3 +1,9 @@
+2011-09-28 Martin Robinson <[email protected]>
+
+ Fix the WebGL build on WebKit2 GTK+.
+
+ * GNUmakefile.am: Add OPENGL_LIBS to WebKit2 targets.
+
2011-09-28 Brent Fulgham <[email protected]>
WinCairo build fix.
Modified: trunk/Source/WebKit2/GNUmakefile.am (96294 => 96295)
--- trunk/Source/WebKit2/GNUmakefile.am 2011-09-29 04:12:42 UTC (rev 96294)
+++ trunk/Source/WebKit2/GNUmakefile.am 2011-09-29 04:48:58 UTC (rev 96295)
@@ -936,6 +936,7 @@
$(LIBSOUP_LIBS) \
$(LIBXML_LIBS) \
$(LIBXSLT_LIBS) \
+ $(OPENGL_LIBS) \
$(PANGO_LIBS) \
$(PNG_LIBS) \
$(SQLITE3_LIBS) \
@@ -1365,6 +1366,7 @@
$(LIBXML_LIBS) \
$(LIBXSLT_LIBS) \
$(OLE32_LIBS) \
+ $(OPENGL_LIBS) \
$(PANGO_LIBS) \
$(PNG_LIBS) \
$(SHLWAPI_LIBS) \
Modified: trunk/configure.ac (96294 => 96295)
--- trunk/configure.ac 2011-09-29 04:12:42 UTC (rev 96294)
+++ trunk/configure.ac 2011-09-29 04:48:58 UTC (rev 96295)
@@ -386,7 +386,7 @@
if test "$enable_webgl" = "yes"; then
AC_CHECK_HEADERS([GL/gl.h], [], AC_MSG_ERROR([OpenGL header not found]))
AC_CHECK_HEADERS([GL/glx.h], [], AC_MSG_ERROR([GLX header not found]))
- OPENGL_LIBS=-lGL
+ OPENGL_LIBS="-lGL -ldl"
fi
AC_SUBST([OPENGL_LIBS])
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
