Bug 1350230 - add other-licenses/nsis/Contrib/CityHash to SeaMonkey build. rs=bustage-fix
authorFrank-Rainer Grahl <frgrahl@gmx.net>
Fri, 24 Mar 2017 17:33:43 +0100
changeset 27967 dbf5733f62d32f097ada3145ad23b8146db17827
parent 27966 1eeda1fa27c89eb9523052f7f596a0ed8f6bf98f
child 27968 725206ff24cc9e4933df23f1db7ce465114fa22d
push id1966
push userclokep@gmail.com
push dateMon, 12 Jun 2017 16:57:35 +0000
treeherdercomm-beta@32d9b8d10da1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1350230, 1324617
Bug 1350230 - add other-licenses/nsis/Contrib/CityHash to SeaMonkey build. rs=bustage-fix Port part of Bug 1324617 [Allow any of multiple installations to be set as the Windows default browser]
suite/shell/src/moz.build
--- a/suite/shell/src/moz.build
+++ b/suite/shell/src/moz.build
@@ -1,15 +1,21 @@
 # vim: set filetype=python:
 # 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/.
 
 if CONFIG['OS_ARCH'] == 'WINNT':
-    SOURCES += ['nsWindowsShellService.cpp']
+    SOURCES += [
+        '../../../mozilla/other-licenses/nsis/Contrib/CityHash/cityhash/city.cpp',
+        'nsWindowsShellService.cpp',
+    ]
+    LOCAL_INCLUDES += [
+        '../../../mozilla/other-licenses/nsis/Contrib/CityHash/cityhash',
+    ]
     OS_LIBS += [
         'ole32',
         'version',
         'uuid',
         'shell32',
     ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     SOURCES += ['nsMacShellService.cpp']