diff options
Diffstat (limited to 'Tools/GNUmakefile.am')
-rw-r--r-- | Tools/GNUmakefile.am | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/Tools/GNUmakefile.am b/Tools/GNUmakefile.am index 4813346..3db766f 100644 --- a/Tools/GNUmakefile.am +++ b/Tools/GNUmakefile.am @@ -5,9 +5,9 @@ noinst_PROGRAMS += \ # GtkLauncher Programs_GtkLauncher_CPPFLAGS = \ - -I$(srcdir)/WebKit/gtk \ + -I$(srcdir)/Source/WebKit/gtk \ -I$(srcdir)/Source/WebCore/platform/network/soup/cache/ \ - -I$(top_builddir)/WebKit/gtk \ + -I$(top_builddir)/Source/WebKit/gtk \ -I$(top_builddir)/DerivedSources \ $(global_cppflags) \ $(javascriptcore_cppflags) @@ -37,10 +37,10 @@ dumprendertree_cppflags := \ -I$(srcdir)/Tools/DumpRenderTree \ -I$(srcdir)/Tools/DumpRenderTree/cairo \ -I$(srcdir)/Tools/DumpRenderTree/gtk \ - -I$(srcdir)/WebKit/gtk \ + -I$(srcdir)/Source/WebKit/gtk \ -I$(srcdir)/Source/WebCore/platform/gtk \ -I$(srcdir)/Source/WebCore/platform/network/soup/cache/ \ - -I$(top_builddir)/WebKit/gtk \ + -I$(top_builddir)/Source/WebKit/gtk \ -I$(top_builddir)/DerivedSources \ $(global_cppflags) \ $(javascriptcore_cppflags) @@ -162,6 +162,11 @@ TestNetscapePlugin_libtestnetscapeplugin_la_CPPFLAGS = \ $(global_cppflags) \ $(javascriptcore_cppflags) +# For the Gtk port we want to use XP_UNIX both on X11 and Mac +if !TARGET_WIN32 +TestNetscapePlugin_libtestnetscapeplugin_la_CPPFLAGS += -DXP_UNIX +endif + TestNetscapePlugin_libtestnetscapeplugin_la_SOURCES = \ Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npapi.h \ Tools/DumpRenderTree/unix/TestNetscapePlugin/ForwardingHeaders/WebKit/npfunctions.h \ |