Commit dface958 authored by benjamin@webkit.org's avatar benjamin@webkit.org

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.


git-svn-id: http://svn.webkit.org/repository/webkit/trunk@147724 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 1af8f920
2013-04-05 Benjamin Poulain <benjamin@webkit.org>
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 <benjamin@webkit.org>
Fix GTK+ build after r147712
......
......@@ -179,6 +179,7 @@ EXTRA_DIST += \
# Include module makefiles
include Source/WTF/GNUmakefile.am
include Source/JavaScriptCore/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
......
2013-04-05 Benjamin Poulain <benjamin@webkit.org>
Fix GTK+ for real after r147712
Reviewed by Ryosuke Niwa.
* GNUmakefile.am: Added.
* Platform: Added.
# 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) \
$(javascriptcore_cppflags) \
-fno-strict-aliasing \
$(GTK_CFLAGS) \
$(LIBSECRET_CFLAGS) \
$(LIBSOUP_CFLAGS)
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment