Bug 1541179 - Part 6: Update and tidy suite/app/ build files. r=frg a=frg
authorIan Neal <iann_cvs@blueyonder.co.uk>
Thu, 11 Apr 2019 20:30:43 +0200
changeset 32166 e624eecfb238
parent 32165 1315e3ad4fec
child 32167 8ea20a66a269
push id183
push userfrgrahl@gmx.net
push dateThu, 11 Apr 2019 18:31:37 +0000
treeherdercomm-esr60@8e29ae45df19 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfrg, frg
bugs1541179, 1244999
Bug 1541179 - Part 6: Update and tidy suite/app/ build files. r=frg a=frg Port Bug 1244999 [Move icon-related DEFINES to moz.build in browser/app].
suite/app/Makefile.in
suite/app/moz.build
--- a/suite/app/Makefile.in
+++ b/suite/app/Makefile.in
@@ -1,22 +1,16 @@
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 dist_dest   = $(DIST)/$(MOZ_MACBUNDLE_NAME)
 
 AB_CD = $(MOZ_UI_LOCALE)
 
-# For splash.rc
-DEFINES += \
-	-DSEAMONKEY_ICO='"$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/icons/windows/main-window.ico"' \
-	-DHTML_FILE_ICO='"$(topsrcdir)/$(MOZ_BRANDING_DIRECTORY)/icons/windows/html-file.ico"' \
-	$(NULL)
-
 # Build a binary bootstrapping with XRE_main
 
 ifndef MOZ_WINCONSOLE
 ifdef MOZ_DEBUG
 MOZ_WINCONSOLE = 1
 else
 MOZ_WINCONSOLE = 0
 endif
--- a/suite/app/moz.build
+++ b/suite/app/moz.build
@@ -67,15 +67,21 @@ if CONFIG['MOZ_LINUX_32_SSE2_STARTUP_ERR
     DEFINES['MOZ_LINUX_32_SSE2_STARTUP_ERROR'] = True
     COMPILE_FLAGS['OS_CXXFLAGS'] = [
         f for f in COMPILE_FLAGS.get('OS_CXXFLAGS', [])
         if not f.startswith('-march=') and f not in ('-msse', '-msse2', '-mfpmath=sse')
     ] + [
         '-mno-sse', '-mno-sse2', '-mfpmath=387',
     ]
 
+# For splash.rc
+DEFINES['SEAMONKEY_ICO'] = '"%s/%s/icons/windows/main-window.ico"' % (
+    TOPSRCDIR, CONFIG['MOZ_BRANDING_DIRECTORY'])
+DEFINES['HTML_FILE_ICO'] = '"%s/%s/icons/windows/html-file.ico"' % (
+    TOPSRCDIR, CONFIG['MOZ_BRANDING_DIRECTORY'])
+
 DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
 
 DisableStlWrapping()
 
 FINAL_TARGET_FILES += ['blocklist.xml']
 FINAL_TARGET_FILES.defaults += ['permissions']