summaryrefslogtreecommitdiffstats
path: root/comm/suite/app/moz.build
diff options
context:
space:
mode:
Diffstat (limited to 'comm/suite/app/moz.build')
-rw-r--r--comm/suite/app/moz.build28
1 files changed, 25 insertions, 3 deletions
diff --git a/comm/suite/app/moz.build b/comm/suite/app/moz.build
index 64933fa..b8fd0e0 100644
--- a/comm/suite/app/moz.build
+++ b/comm/suite/app/moz.build
@@ -8,8 +8,9 @@ DIRS += [
]
GeckoProgram(CONFIG['MOZ_APP_NAME'])
-USE_LIBS += ['mozglue']
+
SOURCES += ['nsSuiteApp.cpp']
+
LOCAL_INCLUDES += [
'!/build',
'/ipc/contentproc/',
@@ -49,6 +50,11 @@ if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':
'user32.dll',
]
+ if CONFIG['CC_TYPE'] == "msvc":
+ CFLAGS += ['-guard:cf']
+ CXXFLAGS += ['-guard:cf']
+ LDFLAGS += ['-guard:cf']
+
# Control the default heap size.
# This is the heap returned by GetProcessHeap().
# As we use the CRT heap, the default size is too large and wastes VM.
@@ -60,15 +66,31 @@ if CONFIG['MOZ_SANDBOX'] and CONFIG['OS_ARCH'] == 'WINNT':
if CONFIG['OS_ARCH'] == 'WINNT' and CONFIG['CC_TYPE'] not in ('clang', 'gcc'):
LDFLAGS += ['/HEAP:0x40000']
+DisableStlWrapping()
+
if CONFIG['MOZ_LINKER']:
OS_LIBS += CONFIG['MOZ_ZLIB_LIBS']
+if CONFIG['HAVE_CLOCK_MONOTONIC']:
+ OS_LIBS += CONFIG['REALTIME_LIBS']
+
if CONFIG['MOZ_LINUX_32_SSE2_STARTUP_ERROR']:
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',
+ ]
-DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
+# 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'])
-DisableStlWrapping()
+DEFINES['APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
+FINAL_TARGET_FILES += ['blocklist.xml']
FINAL_TARGET_FILES.defaults += ['permissions']