Bug 1027034 - Properly set up Gtk+3 compatibility headers. r=karlt
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 19 Jun 2014 09:06:14 +0900
changeset 210279 48639e44baf44782fa5d0b1138a96bb229e53d84
parent 210278 8832820c5869c62fa952a59fb222b4daf1fa7077
child 210280 d452ed915a5bd12a72cde9f4c37d46e251289264
push id3857
push userraliiev@mozilla.com
push dateTue, 02 Sep 2014 16:39:23 +0000
treeherdermozilla-beta@5638b907b505 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskarlt
bugs1027034
milestone33.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1027034 - Properly set up Gtk+3 compatibility headers. r=karlt
config/config.mk
widget/gtk/compat-gtk3/gtk/gtkenums.h
widget/gtk/compat/gtk/gtkenums.h
--- a/config/config.mk
+++ b/config/config.mk
@@ -883,16 +883,19 @@ export CL_INCLUDES_PREFIX
 # Make sure that the build system can handle non-ASCII characters
 # in environment variables to prevent it from breking silently on
 # non-English systems.
 export NONASCII
 
 ifdef MOZ_GTK2_CFLAGS
 MOZ_GTK2_CFLAGS := -I$(topsrcdir)/widget/gtk/compat $(MOZ_GTK2_CFLAGS)
 endif
+ifdef MOZ_GTK3_CFLAGS
+MOZ_GTK3_CFLAGS := -I$(topsrcdir)/widget/gtk/compat-gtk3 $(MOZ_GTK3_CFLAGS)
+endif
 
 DEFINES += -DNO_NSPR_10_SUPPORT
 
 ifdef IS_GYP_DIR
 LOCAL_INCLUDES += \
   -I$(topsrcdir)/ipc/chromium/src \
   -I$(topsrcdir)/ipc/glue \
   -I$(DEPTH)/ipc/ipdl/_ipdlheaders \
rename from widget/gtk/compat/gtk/gtkenums.h
rename to widget/gtk/compat-gtk3/gtk/gtkenums.h