Title: [147724] trunk
- Revision
- 147724
- Author
- [email protected]
- Date
- 2013-04-05 01:20:29 -0700 (Fri, 05 Apr 2013)
Log Message
Fix GTK+ for real after r147712
Reviewed by Ryosuke Niwa.
.:
* GNUmakefile.am:
* Source/Platform: Added.
* Source/Platform/GNUmakefile.am: Added.
Source/Platform:
* GNUmakefile.am: Added.
* Platform: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/ChangeLog (147723 => 147724)
--- trunk/ChangeLog 2013-04-05 08:20:10 UTC (rev 147723)
+++ trunk/ChangeLog 2013-04-05 08:20:29 UTC (rev 147724)
@@ -1,5 +1,15 @@
2013-04-05 Benjamin Poulain <[email protected]>
+ Fix GTK+ for real after r147712
+
+ Reviewed by Ryosuke Niwa.
+
+ * GNUmakefile.am:
+ * Source/Platform: Added.
+ * Source/Platform/GNUmakefile.am: Added.
+
+2013-04-05 Benjamin Poulain <[email protected]>
+
Fix GTK+ build after r147712
Unreviewed.
Modified: trunk/GNUmakefile.am (147723 => 147724)
--- trunk/GNUmakefile.am 2013-04-05 08:20:10 UTC (rev 147723)
+++ trunk/GNUmakefile.am 2013-04-05 08:20:29 UTC (rev 147724)
@@ -179,6 +179,7 @@
# Include module makefiles
include Source/WTF/GNUmakefile.am
include Source/_javascript_Core/GNUmakefile.am
+include Source/Platform/GNUmakefile.am
include Source/WebCore/GNUmakefile.am
include Source/WebCore/bindings/gobject/GNUmakefile.am
include Source/WebCore/platform/gtk/po/GNUmakefile.am
Added: trunk/Source/Platform/ChangeLog (0 => 147724)
--- trunk/Source/Platform/ChangeLog (rev 0)
+++ trunk/Source/Platform/ChangeLog 2013-04-05 08:20:29 UTC (rev 147724)
@@ -0,0 +1,8 @@
+2013-04-05 Benjamin Poulain <[email protected]>
+
+ Fix GTK+ for real after r147712
+
+ Reviewed by Ryosuke Niwa.
+
+ * GNUmakefile.am: Added.
+ * Platform: Added.
Added: trunk/Source/Platform/GNUmakefile.am (0 => 147724)
--- trunk/Source/Platform/GNUmakefile.am (rev 0)
+++ trunk/Source/Platform/GNUmakefile.am 2013-04-05 08:20:29 UTC (rev 147724)
@@ -0,0 +1,61 @@
+# The platform layer code is built into two separate static libraries - libPlatformGtk.la
+# is built from files that require GTK+ and libPlatform.la is built from all the other files.
+# This makes it possible to build two separate libPlatformGtk.la libraries, one using GTK3
+# and the other (named libPlatformGtk2.la) using GTK2. The latter is required by the
+# WebKitPluginProcess in WebKit2 as some plugins (such as Flash) still use GTK2.
+# For now we only build the libPlatformGtk library as there are no source files in place yet
+# that could be built into libPlatform.
+
+platformgtk_cppflags += \
+ -DWEBKITGTK_API_VERSION_STRING=\"@WEBKITGTK_API_VERSION@\" \
+ -I$(srcdir)/Source/ThirdParty/ANGLE/src \
+ -I$(srcdir)/Source/ThirdParty/ANGLE/include \
+ -I$(srcdir)/Source/ThirdParty/ANGLE/include/GLSLANG \
+ -I$(srcdir)/Source/ThirdParty/ANGLE/include/KHR \
+ -DDATA_DIR=\"${datadir}\"
+
+# This is the minimal set of Source/WebCore/platform subdirectories that contain headers required by the GTK-specific
+# platform source files. These inclusions are required due to platform layer source files not yet completely migrated
+# into Source/Platform. Only Source/WebCore/platform subdirectories must be listed here as this, coupled with the
+# header inclusion in source files that's done via specifying the header basename, prevents any platform violations
+# occurring.
+platform_webcore_cppflags += \
+ -I$(srcdir)/Source/WebCore/platform \
+ -I$(srcdir)/Source/WebCore/platform/animation \
+ -I$(srcdir)/Source/WebCore/platform/audio \
+ -I$(srcdir)/Source/WebCore/platform/cairo \
+ -I$(srcdir)/Source/WebCore/platform/graphics \
+ -I$(srcdir)/Source/WebCore/platform/graphics/cairo \
+ -I$(srcdir)/Source/WebCore/platform/graphics/gstreamer \
+ -I$(srcdir)/Source/WebCore/platform/graphics/gtk \
+ -I$(srcdir)/Source/WebCore/platform/graphics/transforms \
+ -I$(srcdir)/Source/WebCore/platform/gtk \
+ -I$(srcdir)/Source/WebCore/platform/network \
+ -I$(srcdir)/Source/WebCore/platform/network/gtk \
+ -I$(srcdir)/Source/WebCore/platform/network/soup \
+ -I$(srcdir)/Source/WebCore/platform/text
+
+noinst_LTLIBRARIES += \
+ libPlatformGtk.la
+
+libPlatformGtk_la_SOURCES = \
+ $(platformgtk_sources)
+
+libPlatformGtk_la_CXXFLAGS = \
+ -fvisibility-inlines-hidden \
+ $(global_cxxflags)
+
+libPlatformGtk_la_CFLAGS = \
+ -fvisibility=hidden \
+ $(global_cflags)
+
+libPlatformGtk_la_CPPFLAGS = \
+ -DBUILDING_WEBKIT \
+ $(global_cppflags) \
+ $(platformgtk_cppflags) \
+ $(platform_webcore_cppflags) \
+ $(_javascript_core_cppflags) \
+ -fno-strict-aliasing \
+ $(GTK_CFLAGS) \
+ $(LIBSECRET_CFLAGS) \
+ $(LIBSOUP_CFLAGS)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
