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
This commit is contained in:
Mike Hommey 2021-12-23 20:29:07 +00:00
Родитель a6f09dd1ef
Коммит fce6eb7d83
48 изменённых файлов: 86 добавлений и 68 удалений

Просмотреть файл

@ -50,8 +50,8 @@ LOCAL_INCLUDES += [
FINAL_LIBRARY = "xul" FINAL_LIBRARY = "xul"
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CFLAGS += CONFIG["TK_CFLAGS"] CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
CXXFLAGS += CONFIG["TK_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
if CONFIG["MOZ_ENABLE_DBUS"]: if CONFIG["MOZ_ENABLE_DBUS"]:
CXXFLAGS += CONFIG["MOZ_DBUS_CFLAGS"] CXXFLAGS += CONFIG["MOZ_DBUS_CFLAGS"]

Просмотреть файл

@ -81,7 +81,9 @@ for var in (
): ):
DEFINES[var] = '"%s"' % CONFIG[var] 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"]: if CONFIG["MOZ_ENABLE_DBUS"]:
CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"]

Просмотреть файл

@ -41,7 +41,7 @@ LOCAL_INCLUDES += [
] ]
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["TK_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
with Files("**"): with Files("**"):
BUG_COMPONENT = ("Toolkit", "Startup and Profile System") BUG_COMPONENT = ("Toolkit", "Startup and Profile System")

Просмотреть файл

@ -573,8 +573,8 @@ include("/ipc/chromium/chromium-config.mozbuild")
FINAL_LIBRARY = "xul" FINAL_LIBRARY = "xul"
if CONFIG["MOZ_X11"]: if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["TK_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
GeneratedFile( GeneratedFile(
"UseCounterList.h", "UseCounterList.h",

Просмотреть файл

@ -202,7 +202,8 @@ LOCAL_INCLUDES += [
"/media/libyuv/libyuv/include", "/media/libyuv/libyuv/include",
] ]
CXXFLAGS += CONFIG["TK_CFLAGS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"] LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"]

Просмотреть файл

@ -65,7 +65,8 @@ include("/tools/fuzzing/libfuzzer-config.mozbuild")
FINAL_LIBRARY = "xul" FINAL_LIBRARY = "xul"
CXXFLAGS += CONFIG["TK_CFLAGS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
BROWSER_CHROME_MANIFESTS += ["tests/browser.ini"] BROWSER_CHROME_MANIFESTS += ["tests/browser.ini"]
MOCHITEST_MANIFESTS += ["tests/mochitest.ini"] MOCHITEST_MANIFESTS += ["tests/mochitest.ini"]

Просмотреть файл

@ -247,7 +247,8 @@ MOCHITEST_CHROME_MANIFESTS += ["tests/chrome.ini"]
MOCHITEST_MANIFESTS += ["tests/mochitest.ini"] MOCHITEST_MANIFESTS += ["tests/mochitest.ini"]
XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell.ini"] XPCSHELL_TESTS_MANIFESTS += ["tests/xpcshell.ini"]
CXXFLAGS += CONFIG["TK_CFLAGS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
if CONFIG["FUZZING"] and CONFIG["FUZZING_INTERFACES"]: if CONFIG["FUZZING"] and CONFIG["FUZZING_INTERFACES"]:
TEST_DIRS += ["fuzztest"] TEST_DIRS += ["fuzztest"]

Просмотреть файл

@ -26,7 +26,7 @@ if CONFIG['CC_TYPE'] == 'gcc':
'-Wno-attributes', '-Wno-attributes',
] ]
if CONFIG['MOZ_WAYLAND']: if CONFIG['MOZ_WAYLAND']:
CXXFLAGS += CONFIG['TK_CFLAGS'] CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS']
DEFINES['MOZ_WAYLAND_USE_VAAPI'] = 1 DEFINES['MOZ_WAYLAND_USE_VAAPI'] = 1
UNIFIED_SOURCES += [ UNIFIED_SOURCES += [
'../FFmpegVideoFramePool.cpp', '../FFmpegVideoFramePool.cpp',

Просмотреть файл

@ -37,7 +37,7 @@ DEFINES["FFVPX_VERSION"] = 46465650
DEFINES["USING_MOZFFVPX"] = True DEFINES["USING_MOZFFVPX"] = True
if CONFIG["MOZ_WAYLAND"]: if CONFIG["MOZ_WAYLAND"]:
CXXFLAGS += CONFIG["TK_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
DEFINES["MOZ_WAYLAND_USE_VAAPI"] = 1 DEFINES["MOZ_WAYLAND_USE_VAAPI"] = 1
FINAL_LIBRARY = "xul" FINAL_LIBRARY = "xul"

Просмотреть файл

@ -41,4 +41,5 @@ include("/ipc/chromium/chromium-config.mozbuild")
FINAL_LIBRARY = "xul" FINAL_LIBRARY = "xul"
CXXFLAGS += CONFIG["TK_CFLAGS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]

Просмотреть файл

@ -150,8 +150,9 @@ FINAL_LIBRARY = "xul"
if CONFIG["MOZ_D3DCOMPILER_VISTA_DLL"]: if CONFIG["MOZ_D3DCOMPILER_VISTA_DLL"]:
DEFINES["MOZ_D3DCOMPILER_VISTA_DLL"] = CONFIG["MOZ_D3DCOMPILER_VISTA_DLL"] DEFINES["MOZ_D3DCOMPILER_VISTA_DLL"] = CONFIG["MOZ_D3DCOMPILER_VISTA_DLL"]
CXXFLAGS += CONFIG["TK_CFLAGS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CFLAGS += CONFIG["TK_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
CXXFLAGS += ["-Werror=switch"] CXXFLAGS += ["-Werror=switch"]

Просмотреть файл

@ -79,7 +79,9 @@ include("/ipc/chromium/chromium-config.mozbuild")
FINAL_LIBRARY = "xul" FINAL_LIBRARY = "xul"
CXXFLAGS += CONFIG["TK_CFLAGS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
CXXFLAGS += ["-Werror=switch"] CXXFLAGS += ["-Werror=switch"]
LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"] LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"]

Просмотреть файл

@ -495,7 +495,9 @@ if CONFIG["ENABLE_TESTS"]:
MOCHITEST_MANIFESTS += ["apz/test/mochitest/mochitest.ini"] MOCHITEST_MANIFESTS += ["apz/test/mochitest/mochitest.ini"]
BROWSER_CHROME_MANIFESTS += ["apz/test/mochitest/browser.ini"] BROWSER_CHROME_MANIFESTS += ["apz/test/mochitest/browser.ini"]
CXXFLAGS += CONFIG["TK_CFLAGS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
CXXFLAGS += ["-Werror=switch"] CXXFLAGS += ["-Werror=switch"]
LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"] LOCAL_INCLUDES += CONFIG["SKIA_INCLUDES"]

Просмотреть файл

@ -91,7 +91,6 @@ LOCAL_INCLUDES += [
FINAL_LIBRARY = "xul" FINAL_LIBRARY = "xul"
CXXFLAGS += CONFIG["TK_CFLAGS"]
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
CXXFLAGS += CONFIG["MOZ_PANGO_CFLAGS"] CXXFLAGS += CONFIG["MOZ_PANGO_CFLAGS"]

Просмотреть файл

@ -272,13 +272,12 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
if CONFIG[var]: if CONFIG[var]:
DEFINES[var] = True DEFINES[var] = True
CXXFLAGS += CONFIG["TK_CFLAGS"]
CFLAGS += CONFIG["TK_CFLAGS"]
if CONFIG["MOZ_WIDGET_TOOLKIT"] in ("android"): if CONFIG["MOZ_WIDGET_TOOLKIT"] in ("android"):
CXXFLAGS += CONFIG["CAIRO_FT_CFLAGS"] CXXFLAGS += CONFIG["CAIRO_FT_CFLAGS"]
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
CXXFLAGS += CONFIG["MOZ_PANGO_CFLAGS"] CXXFLAGS += CONFIG["MOZ_PANGO_CFLAGS"]
if CONFIG["MOZ_WAYLAND"]: if CONFIG["MOZ_WAYLAND"]:

Просмотреть файл

@ -91,8 +91,9 @@ if CONFIG["OS_ARCH"] == "WINNT":
LOCAL_INCLUDES += ["/layout/generic", "/widget", "/widget/windows"] LOCAL_INCLUDES += ["/layout/generic", "/widget", "/widget/windows"]
SOURCES += ["FxROutputHandler.cpp", "FxRWindowManager.cpp"] SOURCES += ["FxROutputHandler.cpp", "FxRWindowManager.cpp"]
CXXFLAGS += CONFIG["TK_CFLAGS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CFLAGS += CONFIG["TK_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
include("/ipc/chromium/chromium-config.mozbuild") include("/ipc/chromium/chromium-config.mozbuild")

Просмотреть файл

@ -124,5 +124,7 @@ FINAL_LIBRARY = "xul"
LOCAL_INCLUDES += [ LOCAL_INCLUDES += [
"/gfx/cairo/cairo/src", "/gfx/cairo/cairo/src",
] ]
CXXFLAGS += CONFIG["TK_CFLAGS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
CXXFLAGS += ["-Werror=switch"] CXXFLAGS += ["-Werror=switch"]

Просмотреть файл

@ -14,6 +14,7 @@ EXPORTS += [
FINAL_LIBRARY = "xul" FINAL_LIBRARY = "xul"
CXXFLAGS += CONFIG["TK_CFLAGS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
include("/ipc/chromium/chromium-config.mozbuild") include("/ipc/chromium/chromium-config.mozbuild")

Просмотреть файл

@ -123,7 +123,8 @@ if os_solaris:
"src/base/time_posix.cc", "src/base/time_posix.cc",
] ]
CXXFLAGS += CONFIG["TK_CFLAGS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
TEST_DIRS += [ TEST_DIRS += [
"gtest", "gtest",

Просмотреть файл

@ -15,7 +15,8 @@ FINAL_LIBRARY = "xul"
# We #include some things in the dom/plugins/ directory that rely on # We #include some things in the dom/plugins/ directory that rely on
# toolkit libraries. # toolkit libraries.
CXXFLAGS += CONFIG["TK_CFLAGS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
# Add libFuzzer configuration directives # Add libFuzzer configuration directives
include("/tools/fuzzing/libfuzzer-config.mozbuild") include("/tools/fuzzing/libfuzzer-config.mozbuild")

Просмотреть файл

@ -68,6 +68,7 @@ if CONFIG["OS_TARGET"] == "Darwin":
"-framework Foundation", "-framework Foundation",
] ]
CFLAGS += CONFIG["TK_CFLAGS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["TK_CFLAGS"] CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
OS_LIBS += CONFIG["TK_LIBS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
OS_LIBS += CONFIG["MOZ_GTK3_LIBS"]

Просмотреть файл

@ -266,4 +266,4 @@ MOCHITEST_MANIFESTS += ["test/mochitest.ini"]
MOCHITEST_CHROME_MANIFESTS += ["test/chrome.ini"] MOCHITEST_CHROME_MANIFESTS += ["test/chrome.ini"]
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["TK_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]

Просмотреть файл

@ -53,8 +53,9 @@ UNIFIED_SOURCES += [
DIRS += ["tree"] DIRS += ["tree"]
CFLAGS += CONFIG["TK_CFLAGS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["TK_CFLAGS"] CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
include("/ipc/chromium/chromium-config.mozbuild") include("/ipc/chromium/chromium-config.mozbuild")

Просмотреть файл

@ -35,7 +35,8 @@ LOCAL_INCLUDES += [
FINAL_LIBRARY = "xul" FINAL_LIBRARY = "xul"
CXXFLAGS += CONFIG["TK_CFLAGS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
with Files("**"): with Files("**"):
BUG_COMPONENT = ("Core", "Widget: Gtk") BUG_COMPONENT = ("Core", "Widget: Gtk")

Просмотреть файл

@ -1263,8 +1263,6 @@ esac
if test "$COMPILE_ENVIRONMENT"; then if test "$COMPILE_ENVIRONMENT"; then
if test "$MOZ_WIDGET_TOOLKIT" = gtk; then if test "$MOZ_WIDGET_TOOLKIT" = gtk; then
PKG_CHECK_MODULES(MOZ_GTK3, gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 gio-unix-2.0 $GDK_PACKAGES) PKG_CHECK_MODULES(MOZ_GTK3, gtk+-3.0 >= $GTK3_VERSION gtk+-unix-print-3.0 glib-2.0 gobject-2.0 gio-unix-2.0 $GDK_PACKAGES)
TK_CFLAGS=$MOZ_GTK3_CFLAGS
TK_LIBS=$MOZ_GTK3_LIBS
AC_DEFINE_UNQUOTED(GDK_VERSION_MIN_REQUIRED,$GDK_VERSION_MIN_REQUIRED) AC_DEFINE_UNQUOTED(GDK_VERSION_MIN_REQUIRED,$GDK_VERSION_MIN_REQUIRED)
AC_DEFINE_UNQUOTED(GDK_VERSION_MAX_ALLOWED,$GDK_VERSION_MAX_ALLOWED) AC_DEFINE_UNQUOTED(GDK_VERSION_MAX_ALLOWED,$GDK_VERSION_MAX_ALLOWED)
fi fi
@ -1274,9 +1272,6 @@ if test "$COMPILE_ENVIRONMENT"; then
fi fi
fi # COMPILE_ENVIRONMENT fi # COMPILE_ENVIRONMENT
AC_SUBST_LIST(TK_CFLAGS)
AC_SUBST_LIST(TK_LIBS)
dnl ======================================================== dnl ========================================================
dnl = dnl =
dnl = Components & Features dnl = Components & Features

Просмотреть файл

@ -471,7 +471,7 @@ def write_mozbuild(
try: try:
if relsrcdir in write_mozbuild_variables["INCLUDE_TK_CFLAGS_DIRS"]: if relsrcdir in write_mozbuild_variables["INCLUDE_TK_CFLAGS_DIRS"]:
mb.write('if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":\n') mb.write('if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":\n')
mb.write(' CXXFLAGS += CONFIG["TK_CFLAGS"]\n') mb.write(' CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]\n')
except KeyError: except KeyError:
pass pass

Просмотреть файл

@ -27,4 +27,5 @@ USE_LIBS += [
"tlsserver", "tlsserver",
] ]
CXXFLAGS += CONFIG["TK_CFLAGS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]

Просмотреть файл

@ -32,7 +32,7 @@ LOCAL_INCLUDES += [
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["GLIB_CFLAGS"] CXXFLAGS += CONFIG["GLIB_CFLAGS"]
CXXFLAGS += CONFIG["TK_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
FINAL_LIBRARY = "xul" FINAL_LIBRARY = "xul"

Просмотреть файл

@ -27,7 +27,8 @@ USE_LIBS += [
] ]
# For the X11 socket domain inspection in SandboxLaunch: # For the X11 socket domain inspection in SandboxLaunch:
CXXFLAGS += CONFIG["TK_CFLAGS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
FINAL_LIBRARY = "xul" FINAL_LIBRARY = "xul"

Просмотреть файл

@ -9,8 +9,8 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk" and CONFIG["MOZ_X11"]:
SOURCES += [ SOURCES += [
"gdk-screenshot.cpp", "gdk-screenshot.cpp",
] ]
CXXFLAGS += CONFIG["TK_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
OS_LIBS += CONFIG["TK_LIBS"] OS_LIBS += CONFIG["MOZ_GTK3_LIBS"]
if CONFIG["MOZ_ENABLE_DBUS"]: if CONFIG["MOZ_ENABLE_DBUS"]:
OS_LIBS += CONFIG["MOZ_DBUS_GLIB_LIBS"] OS_LIBS += CONFIG["MOZ_DBUS_GLIB_LIBS"]

Просмотреть файл

@ -6,7 +6,7 @@
### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
### DO NOT edit it by hand. ### ### DO NOT edit it by hand. ###
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["TK_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
COMPILE_FLAGS["OS_INCLUDES"] = [] COMPILE_FLAGS["OS_INCLUDES"] = []
AllowCompilerWarnings() AllowCompilerWarnings()

Просмотреть файл

@ -6,7 +6,7 @@
### This moz.build was AUTOMATICALLY GENERATED from a GN config, ### ### This moz.build was AUTOMATICALLY GENERATED from a GN config, ###
### DO NOT edit it by hand. ### ### DO NOT edit it by hand. ###
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["TK_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
COMPILE_FLAGS["OS_INCLUDES"] = [] COMPILE_FLAGS["OS_INCLUDES"] = []
AllowCompilerWarnings() AllowCompilerWarnings()

3
third_party/pipewire/libpipewire/moz.build поставляемый
Просмотреть файл

@ -8,7 +8,8 @@ SOURCES += [
'mozpipewire.cpp', 'mozpipewire.cpp',
] ]
CXXFLAGS += CONFIG['TK_CFLAGS'] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS']
LOCAL_INCLUDES += ['/third_party/pipewire'] LOCAL_INCLUDES += ['/third_party/pipewire']

Просмотреть файл

@ -17,7 +17,8 @@ XPIDL_SOURCES += [
XPIDL_MODULE = "downloads" XPIDL_MODULE = "downloads"
CXXFLAGS += CONFIG["TK_CFLAGS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
SOURCES += [ SOURCES += [
"DownloadPlatform.cpp", "DownloadPlatform.cpp",

Просмотреть файл

@ -142,4 +142,5 @@ if CONFIG['MOZ_USE_PTHREADS']:
# Needed for the gzip streams. # Needed for the gzip streams.
DEFINES['HAVE_ZLIB'] = True DEFINES['HAVE_ZLIB'] = True
CXXFLAGS += CONFIG['TK_CFLAGS'] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG['MOZ_GTK3_CFLAGS']

Просмотреть файл

@ -32,7 +32,7 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
"nsXRemoteClient.cpp", "nsXRemoteClient.cpp",
"nsXRemoteServer.cpp", "nsXRemoteServer.cpp",
] ]
CXXFLAGS += CONFIG["TK_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows": if CONFIG["MOZ_WIDGET_TOOLKIT"] == "windows":
SOURCES += [ SOURCES += [

Просмотреть файл

@ -82,9 +82,9 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
USE_LIBS += [ USE_LIBS += [
"breakpad_linux_common_s", "breakpad_linux_common_s",
] ]
OS_LIBS += CONFIG["TK_LIBS"] OS_LIBS += CONFIG["MOZ_GTK3_LIBS"]
OS_LIBS += CONFIG["MOZ_GTHREAD_LIBS"] OS_LIBS += CONFIG["MOZ_GTHREAD_LIBS"]
CXXFLAGS += CONFIG["TK_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
CXXFLAGS += CONFIG["MOZ_GTHREAD_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTHREAD_CFLAGS"]
if CONFIG["OS_ARCH"] == "Linux" or CONFIG["OS_ARCH"] == "SunOS": if CONFIG["OS_ARCH"] == "Linux" or CONFIG["OS_ARCH"] == "SunOS":

Просмотреть файл

@ -319,7 +319,7 @@ if CONFIG["MOZ_ENABLE_DBUS"]:
OS_LIBS += CONFIG["MOZ_DBUS_GLIB_LIBS"] OS_LIBS += CONFIG["MOZ_DBUS_GLIB_LIBS"]
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
OS_LIBS += [l for l in CONFIG["TK_LIBS"] if l not in ("-lgtk-3", "-lgdk-3")] OS_LIBS += [l for l in CONFIG["MOZ_GTK3_LIBS"] if l not in ("-lgtk-3", "-lgdk-3")]
OS_LIBS += CONFIG["MOZ_X11_LIBS"] OS_LIBS += CONFIG["MOZ_X11_LIBS"]
OS_LIBS += CONFIG["MOZ_PANGO_LIBS"] OS_LIBS += CONFIG["MOZ_PANGO_LIBS"]

Просмотреть файл

@ -109,8 +109,8 @@ elif CONFIG["OS_ARCH"] == "WINNT":
WIN32_EXE_LDFLAGS += ["-municode"] WIN32_EXE_LDFLAGS += ["-municode"]
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["TK_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
OS_LIBS += CONFIG["TK_LIBS"] OS_LIBS += CONFIG["MOZ_GTK3_LIBS"]
if CONFIG["CC_TYPE"] == "gcc": if CONFIG["CC_TYPE"] == "gcc":
CXXFLAGS += ["-Wno-format-truncation"] CXXFLAGS += ["-Wno-format-truncation"]

Просмотреть файл

@ -29,4 +29,4 @@ LOCAL_INCLUDES += [
CXXFLAGS += CONFIG["GLIB_CFLAGS"] CXXFLAGS += CONFIG["GLIB_CFLAGS"]
CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"]
CXXFLAGS += CONFIG["TK_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]

Просмотреть файл

@ -268,11 +268,11 @@ if CONFIG["MOZ_WIDGET_TOOLKIT"] == "cocoa":
"/xpcom/base", "/xpcom/base",
] ]
CXXFLAGS += CONFIG["TK_CFLAGS"]
CXXFLAGS += CONFIG["MOZ_DBUS_CFLAGS"] CXXFLAGS += CONFIG["MOZ_DBUS_CFLAGS"]
CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"]
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
CXXFLAGS += CONFIG["MOZ_PANGO_CFLAGS"] CXXFLAGS += CONFIG["MOZ_PANGO_CFLAGS"]
DEFINES["TOPOBJDIR"] = TOPOBJDIR DEFINES["TOPOBJDIR"] = TOPOBJDIR

Просмотреть файл

@ -134,11 +134,10 @@ LOCAL_INCLUDES += [
] ]
if CONFIG["MOZ_ENABLE_DBUS"]: if CONFIG["MOZ_ENABLE_DBUS"]:
CXXFLAGS += CONFIG["TK_CFLAGS"]
CXXFLAGS += CONFIG["MOZ_DBUS_CFLAGS"] CXXFLAGS += CONFIG["MOZ_DBUS_CFLAGS"]
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["TK_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"]
REQUIRES_UNIFIED_BUILD = True REQUIRES_UNIFIED_BUILD = True

Просмотреть файл

@ -153,8 +153,8 @@ DEFINES["CAIRO_GFX"] = True
DEFINES["MOZ_APP_NAME"] = '"%s"' % CONFIG["MOZ_APP_NAME"] DEFINES["MOZ_APP_NAME"] = '"%s"' % CONFIG["MOZ_APP_NAME"]
CFLAGS += CONFIG["TK_CFLAGS"] CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
CXXFLAGS += CONFIG["TK_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
if CONFIG["MOZ_WAYLAND"]: if CONFIG["MOZ_WAYLAND"]:
CFLAGS += CONFIG["MOZ_WAYLAND_CFLAGS"] CFLAGS += CONFIG["MOZ_WAYLAND_CFLAGS"]

Просмотреть файл

@ -13,4 +13,4 @@ EXPORTS.mozilla.widget += [
SharedLibrary("mozwayland") SharedLibrary("mozwayland")
CFLAGS += CONFIG["TK_CFLAGS"] CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]

Просмотреть файл

@ -37,5 +37,5 @@ include("/ipc/chromium/chromium-config.mozbuild")
FINAL_LIBRARY = "xul" FINAL_LIBRARY = "xul"
CFLAGS += CONFIG["TK_CFLAGS"] CFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
CXXFLAGS += CONFIG["TK_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]

Просмотреть файл

@ -347,7 +347,8 @@ FINAL_LIBRARY = "xul"
if CONFIG["MOZ_ENABLE_D3D10_LAYER"]: if CONFIG["MOZ_ENABLE_D3D10_LAYER"]:
DEFINES["MOZ_ENABLE_D3D10_LAYER"] = True DEFINES["MOZ_ENABLE_D3D10_LAYER"] = True
CXXFLAGS += CONFIG["TK_CFLAGS"] if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
if CONFIG["MOZ_WAYLAND"]: if CONFIG["MOZ_WAYLAND"]:
CXXFLAGS += CONFIG["MOZ_WAYLAND_CFLAGS"] CXXFLAGS += CONFIG["MOZ_WAYLAND_CFLAGS"]

Просмотреть файл

@ -263,7 +263,7 @@ LOCAL_INCLUDES += [
] ]
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["TK_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
if CONFIG["MOZ_BACKGROUNDTASKS"]: if CONFIG["MOZ_BACKGROUNDTASKS"]:
DEFINES["MOZ_BACKGROUNDTASKS"] = True DEFINES["MOZ_BACKGROUNDTASKS"] = True

Просмотреть файл

@ -74,7 +74,7 @@ LOCAL_INCLUDES += [
] ]
if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk": if CONFIG["MOZ_WIDGET_TOOLKIT"] == "gtk":
CXXFLAGS += CONFIG["TK_CFLAGS"] CXXFLAGS += CONFIG["MOZ_GTK3_CFLAGS"]
if CONFIG["MOZ_ENABLE_DBUS"]: if CONFIG["MOZ_ENABLE_DBUS"]:
CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"] CXXFLAGS += CONFIG["MOZ_DBUS_GLIB_CFLAGS"]