Commit fce6eb7d authored by Mike Hommey's avatar Mike Hommey
Browse files

Bug 1747165 - Replace TK_FLAGS/TK_LIBS with MOZ_GTK3_FLAGS/MOZ_GTK3_LIBS.... 

Bug 1747165 - Replace TK_FLAGS/TK_LIBS with MOZ_GTK3_FLAGS/MOZ_GTK3_LIBS. r=firefox-build-system-reviewers,andi

Differential Revision: https://phabricator.services.mozilla.com/D134464
parent a6f09dd1

accessible/atk/moz.build

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ LOCAL_INCLUDES += [ 
FINAL_LIBRARY = "xul"



if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":

    CFLAGS += CONFIG["TK_CFLAGS"]

    CXXFLAGS += CONFIG["TK_CFLAGS"]

    CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]

    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]



if CONFIG["MOZ_ENABLE_DBUS"]:

    CXXFLAGS += CONFIG["MOZ_DBUS_CFLAGS"]

browser/components/shell/moz.build

+3 −1
Original line number Diff line number Diff line
@@ -81,7 +81,9 @@ for var in ( 
):

    DEFINES[var] = '"%s"' % CONFIG[var]



CXXFLAGS += CONFIG["TK_CFLAGS"]

if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":

    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]



if CONFIG["MOZ_ENABLE_DBUS"]:

    CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"]

chrome/moz.build

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ LOCAL_INCLUDES += [ 
]



if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":

    CXXFLAGS += CONFIG["TK_CFLAGS"]

    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]



with Files("**"):

    BUG_COMPONENT = ("Toolkit", "Startup and Profile System")

dom/base/moz.build

+2 −2
Original line number Diff line number Diff line
@@ -573,8 +573,8 @@ include("/ipc/chromium/chromium-config.mozbuild") 


FINAL_LIBRARY = "xul"



if CONFIG["MOZ_X11"]:

    CXXFLAGS += CONFIG["TK_CFLAGS"]

if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":

    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]



GeneratedFile(

    "UseCounterList.h",

dom/canvas/moz.build

+2 −1
Original line number Diff line number Diff line
@@ -202,7 +202,8 @@ LOCAL_INCLUDES += [ 
    "/media/libyuv/libyuv/include",

]



CXXFLAGS += CONFIG["TK_CFLAGS"]

if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":

    CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]



LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"]