summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
Diffstat (limited to 'platform')
-rw-r--r--platform/android/export/export.cpp4
-rw-r--r--platform/server/os_server.h1
-rw-r--r--platform/uwp/detect.py1
-rw-r--r--platform/windows/crash_handler_windows.cpp3
-rw-r--r--platform/windows/detect.py10
-rw-r--r--platform/windows/os_windows.cpp4
-rw-r--r--platform/windows/os_windows.h4
-rw-r--r--platform/x11/detect.py19
8 files changed, 16 insertions, 30 deletions
diff --git a/platform/android/export/export.cpp b/platform/android/export/export.cpp
index 60cc33e6bf..9d9270bdac 100644
--- a/platform/android/export/export.cpp
+++ b/platform/android/export/export.cpp
@@ -301,10 +301,10 @@ class EditorExportPlatformAndroid : public EditorExportPlatform {
args.push_back(d.id);
args.push_back("shell");
args.push_back("getprop");
- int ec;
+ int ec2;
String dp;
- OS::get_singleton()->execute(adb, args, true, NULL, &dp, &ec);
+ OS::get_singleton()->execute(adb, args, true, NULL, &dp, &ec2);
Vector<String> props = dp.split("\n");
String vendor;
diff --git a/platform/server/os_server.h b/platform/server/os_server.h
index 312b5811d1..eebe8ae777 100644
--- a/platform/server/os_server.h
+++ b/platform/server/os_server.h
@@ -32,7 +32,6 @@
#define OS_SERVER_H
#include "drivers/dummy/texture_loader_dummy.h"
-#include "drivers/rtaudio/audio_driver_rtaudio.h"
#include "drivers/unix/os_unix.h"
#include "main/input_default.h"
#ifdef __APPLE__
diff --git a/platform/uwp/detect.py b/platform/uwp/detect.py
index f25b9ba9cd..c32a11b396 100644
--- a/platform/uwp/detect.py
+++ b/platform/uwp/detect.py
@@ -29,7 +29,6 @@ def get_opts():
return [
('msvc_version', 'MSVC version to use (ignored if the VCINSTALLDIR environment variable is set)', None),
- BoolVariable('use_mingw', 'Use the MinGW compiler even if MSVC is installed (only used on Windows)', False),
]
diff --git a/platform/windows/crash_handler_windows.cpp b/platform/windows/crash_handler_windows.cpp
index f93a449c7b..4006c4c60e 100644
--- a/platform/windows/crash_handler_windows.cpp
+++ b/platform/windows/crash_handler_windows.cpp
@@ -30,9 +30,9 @@
#include "crash_handler_windows.h"
+#include "core/os/os.h"
#include "core/project_settings.h"
#include "main/main.h"
-#include "os_windows.h"
#ifdef CRASH_HANDLER_EXCEPTION
@@ -41,6 +41,7 @@
#include <psapi.h>
#include <algorithm>
#include <iterator>
+#include <vector>
#pragma comment(lib, "psapi.lib")
#pragma comment(lib, "dbghelp.lib")
diff --git a/platform/windows/detect.py b/platform/windows/detect.py
index 0662bc2edc..426a5e9e61 100644
--- a/platform/windows/detect.py
+++ b/platform/windows/detect.py
@@ -205,8 +205,8 @@ def configure_msvc(env, manual_msvc_config):
print("Missing environment variable: WindowsSdkDir")
env.AppendUnique(CPPDEFINES = ['WINDOWS_ENABLED', 'OPENGL_ENABLED',
- 'RTAUDIO_ENABLED', 'WASAPI_ENABLED',
- 'WINMIDI_ENABLED', 'TYPED_METHOD_BIND',
+ 'WASAPI_ENABLED', 'WINMIDI_ENABLED',
+ 'TYPED_METHOD_BIND',
'WIN32', 'MSVC',
'WINVER=%s' % env["target_win_version"],
'_WIN32_WINNT=%s' % env["target_win_version"]])
@@ -326,8 +326,8 @@ def configure_mingw(env):
env.Append(CCFLAGS=['-DWINDOWS_ENABLED', '-mwindows'])
env.Append(CCFLAGS=['-DOPENGL_ENABLED'])
- env.Append(CCFLAGS=['-DRTAUDIO_ENABLED'])
env.Append(CCFLAGS=['-DWASAPI_ENABLED'])
+ env.Append(CCFLAGS=['-DWINMIDI_ENABLED'])
env.Append(CCFLAGS=['-DWINVER=%s' % env['target_win_version'], '-D_WIN32_WINNT=%s' % env['target_win_version']])
env.Append(LIBS=['mingw32', 'opengl32', 'dsound', 'ole32', 'd3d9', 'winmm', 'gdi32', 'iphlpapi', 'shlwapi', 'wsock32', 'ws2_32', 'kernel32', 'oleaut32', 'dinput8', 'dxguid', 'ksuser', 'imm32', 'bcrypt','avrt'])
@@ -347,12 +347,12 @@ def configure(env):
env['ENV']['TMP'] = os.environ['TMP']
# First figure out which compiler, version, and target arch we're using
- if os.getenv("VCINSTALLDIR"):
+ if os.getenv("VCINSTALLDIR") and not env["use_mingw"]:
# Manual setup of MSVC
setup_msvc_manual(env)
env.msvc = True
manual_msvc_config = True
- elif env.get('MSVC_VERSION', ''):
+ elif env.get('MSVC_VERSION', '') and not env["use_mingw"]:
setup_msvc_auto(env)
env.msvc = True
manual_msvc_config = False
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index b8a6de1fd1..9f15e7aad7 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -52,6 +52,7 @@
#include "windows_terminal_logger.h"
#include <avrt.h>
+#include <direct.h>
#include <process.h>
#include <regstr.h>
#include <shlobj.h>
@@ -3021,9 +3022,6 @@ OS_Windows::OS_Windows(HINSTANCE _hInstance) {
#ifdef WASAPI_ENABLED
AudioDriverManager::add_driver(&driver_wasapi);
#endif
-#ifdef RTAUDIO_ENABLED
- AudioDriverManager::add_driver(&driver_rtaudio);
-#endif
#ifdef XAUDIO2_ENABLED
AudioDriverManager::add_driver(&driver_xaudio2);
#endif
diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h
index 8ca58b534a..e27dbbe530 100644
--- a/platform/windows/os_windows.h
+++ b/platform/windows/os_windows.h
@@ -36,7 +36,6 @@
#include "core/os/os.h"
#include "core/project_settings.h"
#include "crash_handler_windows.h"
-#include "drivers/rtaudio/audio_driver_rtaudio.h"
#include "drivers/unix/ip_unix.h"
#include "drivers/wasapi/audio_driver_wasapi.h"
#include "drivers/winmidi/midi_driver_winmidi.h"
@@ -142,9 +141,6 @@ class OS_Windows : public OS {
#ifdef WASAPI_ENABLED
AudioDriverWASAPI driver_wasapi;
#endif
-#ifdef RTAUDIO_ENABLED
- AudioDriverRtAudio driver_rtaudio;
-#endif
#ifdef XAUDIO2_ENABLED
AudioDriverXAudio2 driver_xaudio2;
#endif
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 72139538b7..16760f9407 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -2,7 +2,7 @@ import os
import platform
import sys
from compat import decode_utf8
-
+from methods import get_compiler_version
def is_active():
return True
@@ -161,18 +161,11 @@ def configure(env):
env.Append(CCFLAGS=['-pipe'])
env.Append(LINKFLAGS=['-pipe'])
- # Check for gcc version > 5 before adding -no-pie
- import re
- import subprocess
- proc = subprocess.Popen([env['CXX'], '--version'], stdout=subprocess.PIPE)
- (stdout, _) = proc.communicate()
- stdout = decode_utf8(stdout)
- match = re.search('[0-9][0-9.]*', stdout)
- if match is not None:
- version = match.group().split('.')
- if (version[0] > '5'):
- env.Append(CCFLAGS=['-fpie'])
- env.Append(LINKFLAGS=['-no-pie'])
+ # Check for gcc version >= 6 before adding -no-pie
+ version = get_compiler_version(env)
+ if version != None and version[0] > '6':
+ env.Append(CCFLAGS=['-fpie'])
+ env.Append(LINKFLAGS=['-no-pie'])
## Dependencies
generated by cgit v1.2.3 (git 2.25.1) at 2025-03-01 16:23:28 +0000