diff options
| -rw-r--r-- | SConstruct | 10 | ||||
| -rwxr-xr-x | misc/dist/osx_template.app/Contents/Info.plist | 6 | ||||
| -rwxr-xr-x | misc/dist/osx_tools.app/Contents/Info.plist | 4 | ||||
| -rw-r--r-- | platform/osx/detect.py | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/SConstruct b/SConstruct index 785686d428..eb59db006d 100644 --- a/SConstruct +++ b/SConstruct @@ -310,17 +310,17 @@ if selected_platform in platform_list: env.Append(LINKFLAGS=str(LINKFLAGS).split()) # Set our C and C++ standard requirements. - # Prepending to make it possible to override + # C++17 is required as we need guaranteed copy elision as per GH-36436. + # 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. + # both GCC and Clang. Both currently default to gnu11 and gnu++14. env.Prepend(CFLAGS=['-std=gnu11']) - env.Prepend(CXXFLAGS=['-std=gnu++14']) + env.Prepend(CXXFLAGS=['-std=gnu++17']) 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-']) + env.Prepend(CCFLAGS=['/std:c++17', '/permissive-']) # Platform specific flags flag_list = platform_flags[selected_platform] diff --git a/misc/dist/osx_template.app/Contents/Info.plist b/misc/dist/osx_template.app/Contents/Info.plist index 696c825594..3b765e6bb8 100755 --- a/misc/dist/osx_template.app/Contents/Info.plist +++ b/misc/dist/osx_template.app/Contents/Info.plist @@ -31,13 +31,13 @@ <key>NSHumanReadableCopyright</key> <string>$copyright</string> <key>LSMinimumSystemVersion</key> - <string>10.9.0</string> + <string>10.12.0</string> <key>LSMinimumSystemVersionByArchitecture</key> <dict> <key>x86_64</key> - <string>10.9.0</string> + <string>10.12.0</string> </dict> <key>NSHighResolutionCapable</key> $highres </dict> -</plist>
\ No newline at end of file +</plist> diff --git a/misc/dist/osx_tools.app/Contents/Info.plist b/misc/dist/osx_tools.app/Contents/Info.plist index 46550ba6c7..c519a232c4 100755 --- a/misc/dist/osx_tools.app/Contents/Info.plist +++ b/misc/dist/osx_tools.app/Contents/Info.plist @@ -33,11 +33,11 @@ <key>NSHumanReadableCopyright</key> <string>© 2007-2020 Juan Linietsky, Ariel Manzur & Godot Engine contributors</string> <key>LSMinimumSystemVersion</key> - <string>10.9.0</string> + <string>10.12.0</string> <key>LSMinimumSystemVersionByArchitecture</key> <dict> <key>x86_64</key> - <string>10.9.0</string> + <string>10.12.0</string> </dict> <key>NSHighResolutionCapable</key> <true/> diff --git a/platform/osx/detect.py b/platform/osx/detect.py index 0b164a2c56..12ca5c10dc 100644 --- a/platform/osx/detect.py +++ b/platform/osx/detect.py @@ -164,5 +164,5 @@ def configure(env): #env.Append(CPPDEFINES=['GLES_ENABLED', 'OPENGL_ENABLED']) - env.Append(CCFLAGS=['-mmacosx-version-min=10.11']) - env.Append(LINKFLAGS=['-mmacosx-version-min=10.11']) + env.Append(CCFLAGS=['-mmacosx-version-min=10.12']) + env.Append(LINKFLAGS=['-mmacosx-version-min=10.12']) |