diff options
| -rw-r--r-- | platform/x11/detect.py | 4 | ||||
| -rw-r--r-- | servers/audio_server.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index dc5c22b4b3..e257a20bdd 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -149,7 +149,7 @@ def configure(env): env.Append(CCFLAGS=['-pipe']) env.Append(LINKFLAGS=['-pipe']) - # Check for gcc version > 4 before adding -no-pie + # Check for gcc version > 5 before adding -no-pie import re import subprocess proc = subprocess.Popen([env['CXX'], '--version'], stdout=subprocess.PIPE) @@ -157,7 +157,7 @@ def configure(env): match = re.search('[0-9][0-9.]*', stdout) if match is not None: version = match.group().split('.') - if (version[0] > '4'): + if (version[0] > '5'): env.Append(CCFLAGS=['-fpie']) env.Append(LINKFLAGS=['-no-pie']) diff --git a/servers/audio_server.cpp b/servers/audio_server.cpp index b41fcac8fa..33d1e72669 100644 --- a/servers/audio_server.cpp +++ b/servers/audio_server.cpp @@ -1017,7 +1017,7 @@ void AudioServer::update() { void AudioServer::load_default_bus_layout() { - if (FileAccess::exists("res://default_bus_layout.tres")) { + if (ResourceLoader::exists("res://default_bus_layout.tres")) { Ref<AudioBusLayout> default_layout = ResourceLoader::load("res://default_bus_layout.tres"); if (default_layout.is_valid()) { set_bus_layout(default_layout); |