|
@@ -292,6 +292,7 @@ if selected_platform in platform_list:
|
|
if env["extra_suffix"] != '':
|
|
if env["extra_suffix"] != '':
|
|
env.extra_suffix += '.' + env["extra_suffix"]
|
|
env.extra_suffix += '.' + env["extra_suffix"]
|
|
|
|
|
|
|
|
+ # Environment flags
|
|
CCFLAGS = env.get('CCFLAGS', '')
|
|
CCFLAGS = env.get('CCFLAGS', '')
|
|
env['CCFLAGS'] = ''
|
|
env['CCFLAGS'] = ''
|
|
env.Append(CCFLAGS=str(CCFLAGS).split())
|
|
env.Append(CCFLAGS=str(CCFLAGS).split())
|
|
@@ -308,18 +309,28 @@ if selected_platform in platform_list:
|
|
env['LINKFLAGS'] = ''
|
|
env['LINKFLAGS'] = ''
|
|
env.Append(LINKFLAGS=str(LINKFLAGS).split())
|
|
env.Append(LINKFLAGS=str(LINKFLAGS).split())
|
|
|
|
|
|
|
|
+ # Set our C and C++ standard requirements.
|
|
|
|
+ # Prepending to make it possible to override
|
|
|
|
+ if not env.msvc:
|
|
|
|
+ # Specifying GNU extensions support explicitly, which are supported by
|
|
|
|
+ # both GCC and Clang. This mirrors GCC and Clang's current default
|
|
|
|
+ # compile flags if no -std is specified.
|
|
|
|
+ env.Prepend(CFLAGS=['-std=gnu11'])
|
|
|
|
+ env.Prepend(CXXFLAGS=['-std=gnu++14'])
|
|
|
|
+ else:
|
|
|
|
+ # MSVC doesn't have clear C standard support, /std only covers C++.
|
|
|
|
+ # We apply it to CCFLAGS (both C and C++ code) in case it impacts C features.
|
|
|
|
+ env.Prepend(CCFLAGS=['/std:c++14', '/permissive-'])
|
|
|
|
+
|
|
|
|
+ # Platform specific flags
|
|
flag_list = platform_flags[selected_platform]
|
|
flag_list = platform_flags[selected_platform]
|
|
for f in flag_list:
|
|
for f in flag_list:
|
|
if not (f[0] in ARGUMENTS): # allow command line to override platform flags
|
|
if not (f[0] in ARGUMENTS): # allow command line to override platform flags
|
|
env[f[0]] = f[1]
|
|
env[f[0]] = f[1]
|
|
|
|
|
|
- # must happen after the flags, so when flags are used by configure, stuff happens (ie, ssl on x11)
|
|
|
|
|
|
+ # Must happen after the flags definition, so that they can be used by platform detect
|
|
detect.configure(env)
|
|
detect.configure(env)
|
|
|
|
|
|
- # Enable C++11 support
|
|
|
|
- if not env.msvc:
|
|
|
|
- env.Append(CXXFLAGS=['-std=c++11'])
|
|
|
|
-
|
|
|
|
# Configure compiler warnings
|
|
# Configure compiler warnings
|
|
if env.msvc:
|
|
if env.msvc:
|
|
# Truncations, narrowing conversions, signed/unsigned comparisons...
|
|
# Truncations, narrowing conversions, signed/unsigned comparisons...
|