summaryrefslogtreecommitdiff
path: root/platform
diff options
context:
space:
mode:
Diffstat (limited to 'platform')
-rw-r--r--platform/android/SCsub2
-rw-r--r--platform/android/detect.py2
-rw-r--r--platform/android/dir_access_jandroid.cpp1
-rw-r--r--platform/bb10/SCsub2
-rw-r--r--platform/haiku/SCsub2
-rw-r--r--platform/iphone/SCsub2
-rw-r--r--platform/javascript/SCsub2
-rw-r--r--platform/javascript/export/export.cpp4
-rw-r--r--platform/osx/SCsub2
-rw-r--r--platform/osx/detect.py3
-rw-r--r--platform/server/SCsub2
-rw-r--r--platform/server/detect.py3
-rw-r--r--platform/windows/SCsub2
-rw-r--r--platform/windows/os_windows.cpp10
-rw-r--r--platform/windows/os_windows.h6
-rw-r--r--platform/winrt/SCsub3
-rw-r--r--platform/winrt/audio_driver_winrt.cpp244
-rw-r--r--platform/winrt/audio_driver_winrt.h109
-rw-r--r--platform/winrt/detect.py2
-rw-r--r--platform/winrt/os_winrt.h4
-rw-r--r--platform/x11/SCsub2
-rw-r--r--platform/x11/detect.py4
22 files changed, 40 insertions, 373 deletions
diff --git a/platform/android/SCsub b/platform/android/SCsub
index 60bb4bd613..4f9a9709cb 100644
--- a/platform/android/SCsub
+++ b/platform/android/SCsub
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
import shutil
Import('env')
diff --git a/platform/android/detect.py b/platform/android/detect.py
index acf4ce412a..842036f986 100644
--- a/platform/android/detect.py
+++ b/platform/android/detect.py
@@ -131,7 +131,7 @@ def configure(env):
gcc_path=gcc_path+"/darwin-x86_64/bin"
env['SHLINKFLAGS'][1] = '-shared'
env['SHLIBSUFFIX'] = '.so'
- elif (os.platform.startswith('win')):
+ elif (sys.platform.startswith('win')):
if (platform.machine().endswith('64')):
gcc_path=gcc_path+"/windows-x86_64/bin"
else:
diff --git a/platform/android/dir_access_jandroid.cpp b/platform/android/dir_access_jandroid.cpp
index be2ffde2cd..57376f8103 100644
--- a/platform/android/dir_access_jandroid.cpp
+++ b/platform/android/dir_access_jandroid.cpp
@@ -203,7 +203,6 @@ bool DirAccessJAndroid::dir_exists(String p_dir) {
return false;
env->CallVoidMethod(io,_dir_close,res);
- env->DeleteLocalRef(js);
return true;
}
diff --git a/platform/bb10/SCsub b/platform/bb10/SCsub
index 81f6e726e4..84fff0828b 100644
--- a/platform/bb10/SCsub
+++ b/platform/bb10/SCsub
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
Import('env')
bb10_lib = [
diff --git a/platform/haiku/SCsub b/platform/haiku/SCsub
index 1952e6b59b..b5a584baa4 100644
--- a/platform/haiku/SCsub
+++ b/platform/haiku/SCsub
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
Import('env')
common_haiku = [
diff --git a/platform/iphone/SCsub b/platform/iphone/SCsub
index 5b2e1533da..236630bef4 100644
--- a/platform/iphone/SCsub
+++ b/platform/iphone/SCsub
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
Import('env')
iphone_lib = [
diff --git a/platform/javascript/SCsub b/platform/javascript/SCsub
index fc70d45a04..22af436470 100644
--- a/platform/javascript/SCsub
+++ b/platform/javascript/SCsub
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
Import('env')
javascript_files = [
diff --git a/platform/javascript/export/export.cpp b/platform/javascript/export/export.cpp
index de57d770c4..f934916aa2 100644
--- a/platform/javascript/export/export.cpp
+++ b/platform/javascript/export/export.cpp
@@ -195,8 +195,8 @@ void EditorExportPlatformJavaScript::_fix_html(Vector<uint8_t>& p_html, const St
}
CharString cs = strnew.utf8();
- p_html.resize(cs.size());
- for(int i=9;i<cs.size();i++) {
+ p_html.resize(cs.length());
+ for(int i=9;i<cs.length();i++) {
p_html[i]=cs[i];
}
}
diff --git a/platform/osx/SCsub b/platform/osx/SCsub
index 4169795519..217dee81eb 100644
--- a/platform/osx/SCsub
+++ b/platform/osx/SCsub
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
Import('env')
files = [
diff --git a/platform/osx/detect.py b/platform/osx/detect.py
index f8b2153aee..4e772e37eb 100644
--- a/platform/osx/detect.py
+++ b/platform/osx/detect.py
@@ -91,9 +91,6 @@ def configure(env):
env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
env["CC"]="clang"
env["LD"]="clang++"
- if (env["colored"]=="yes"):
- if sys.stdout.isatty():
- env.Append(CPPFLAGS=["-fcolor-diagnostics"])
import methods
diff --git a/platform/server/SCsub b/platform/server/SCsub
index 3dda6b4395..12758c5db0 100644
--- a/platform/server/SCsub
+++ b/platform/server/SCsub
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
Import('env')
diff --git a/platform/server/detect.py b/platform/server/detect.py
index 2f6fb00e0d..ce14100fd0 100644
--- a/platform/server/detect.py
+++ b/platform/server/detect.py
@@ -38,9 +38,6 @@ def configure(env):
env["CC"]="clang"
env["CXX"]="clang++"
env["LD"]="clang++"
- if (env["colored"]=="yes"):
- if sys.stdout.isatty():
- env.Append(CXXFLAGS=["-fcolor-diagnostics"])
is64=sys.maxsize > 2**32
diff --git a/platform/windows/SCsub b/platform/windows/SCsub
index 914cee0fa1..e53eb7af34 100644
--- a/platform/windows/SCsub
+++ b/platform/windows/SCsub
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
Import('env')
diff --git a/platform/windows/os_windows.cpp b/platform/windows/os_windows.cpp
index 0ca5d3bd0f..286f5fb0b7 100644
--- a/platform/windows/os_windows.cpp
+++ b/platform/windows/os_windows.cpp
@@ -1366,13 +1366,16 @@ void OS_Windows::set_mouse_mode(MouseMode p_mode) {
POINT pos = { (int) center.x, (int) center.y };
ClientToScreen(hWnd, &pos);
SetCursorPos(pos.x, pos.y);
- ShowCursor(false);
} else {
- ShowCursor(true);
ReleaseCapture();
ClipCursor(NULL);
}
+ if (p_mode == MOUSE_MODE_CAPTURED || p_mode == MOUSE_MODE_HIDDEN) {
+ hCursor = SetCursor(NULL);
+ } else {
+ SetCursor(hCursor);
+ }
}
OS_Windows::MouseMode OS_Windows::get_mouse_mode() const{
@@ -2418,6 +2421,9 @@ OS_Windows::OS_Windows(HINSTANCE _hInstance) {
#ifdef RTAUDIO_ENABLED
AudioDriverManagerSW::add_driver(&driver_rtaudio);
#endif
+#ifdef XAUDIO2_ENABLED
+ AudioDriverManagerSW::add_driver(&driver_xaudio2);
+#endif
}
diff --git a/platform/windows/os_windows.h b/platform/windows/os_windows.h
index 70ef694957..903dd10c70 100644
--- a/platform/windows/os_windows.h
+++ b/platform/windows/os_windows.h
@@ -41,6 +41,9 @@
#include "servers/audio/audio_server_sw.h"
#include "servers/audio/sample_manager_sw.h"
#include "drivers/rtaudio/audio_driver_rtaudio.h"
+#ifdef XAUDIO2_ENABLED
+#include "drivers/xaudio2/audio_driver_xaudio2.h"
+#endif
#include "servers/spatial_sound/spatial_sound_server_sw.h"
#include "servers/spatial_sound_2d/spatial_sound_2d_server_sw.h"
#include "drivers/unix/ip_unix.h"
@@ -137,6 +140,9 @@ class OS_Windows : public OS {
#ifdef RTAUDIO_ENABLED
AudioDriverRtAudio driver_rtaudio;
#endif
+#ifdef XAUDIO2_ENABLED
+ AudioDriverXAudio2 driver_xaudio2;
+#endif
void _drag_event(int p_x, int p_y, int idx);
void _touch_event(bool p_pressed, int p_x, int p_y, int idx);
diff --git a/platform/winrt/SCsub b/platform/winrt/SCsub
index fde0c11f3b..91a179084d 100644
--- a/platform/winrt/SCsub
+++ b/platform/winrt/SCsub
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
Import('env')
files = [
@@ -8,7 +10,6 @@ files = [
'#platform/windows/key_mapping_win.cpp',
'joystick_winrt.cpp',
'gl_context_egl.cpp',
- 'audio_driver_winrt.cpp',
'app.cpp',
'os_winrt.cpp',
]
diff --git a/platform/winrt/audio_driver_winrt.cpp b/platform/winrt/audio_driver_winrt.cpp
deleted file mode 100644
index ff46244ac3..0000000000
--- a/platform/winrt/audio_driver_winrt.cpp
+++ /dev/null
@@ -1,244 +0,0 @@
-/*************************************************************************/
-/* audio_driver_winrt.cpp */
-/*************************************************************************/
-/* This file is part of: */
-/* GODOT ENGINE */
-/* http://www.godotengine.org */
-/*************************************************************************/
-/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */
-/* */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the */
-/* "Software"), to deal in the Software without restriction, including */
-/* without limitation the rights to use, copy, modify, merge, publish, */
-/* distribute, sublicense, and/or sell copies of the Software, and to */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions: */
-/* */
-/* The above copyright notice and this permission notice shall be */
-/* included in all copies or substantial portions of the Software. */
-/* */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-/*************************************************************************/
-#include "audio_driver_winrt.h"
-
-#include "globals.h"
-#include "os/os.h"
-
-using namespace Windows::Media;
-using namespace Windows::Media::Core;
-using namespace Windows::Media::MediaProperties;
-using namespace Windows::Media::Editing;
-using namespace Windows::Foundation;
-
-const char * AudioDriverWinRT::get_name() const
-{
- return "WinRT";
-}
-
-Error AudioDriverWinRT::init() {
-
- active = false;
- thread_exited = false;
- exit_thread = false;
- pcm_open = false;
- samples_in = NULL;
-
-
- mix_rate = 48000;
- output_format = OUTPUT_STEREO;
- channels = 2;
-
- int latency = GLOBAL_DEF("audio/output_latency", 25);
- buffer_size = nearest_power_of_2(latency * mix_rate / 1000);
-
- samples_in = memnew_arr(int32_t, buffer_size*channels);
- for (int i = 0; i < AUDIO_BUFFERS; i++) {
- samples_out[i] = memnew_arr(int16_t, buffer_size*channels);
- xaudio_buffer[i].AudioBytes = buffer_size * channels * sizeof(int16_t);
- xaudio_buffer[i].pAudioData = (const BYTE*)(samples_out[i]);
- xaudio_buffer[i].Flags = 0;
- }
-
- HRESULT hr;
- hr = XAudio2Create(&xaudio, 0, XAUDIO2_DEFAULT_PROCESSOR);
- if (hr != S_OK) {
- ERR_EXPLAIN("Error creating XAudio2 engine.");
- ERR_FAIL_V(ERR_UNAVAILABLE);
- }
- hr = xaudio->CreateMasteringVoice(&mastering_voice);
- if (hr != S_OK) {
- ERR_EXPLAIN("Error creating XAudio2 mastering voice.");
- ERR_FAIL_V(ERR_UNAVAILABLE);
- }
-
- wave_format.nChannels = channels;
- wave_format.cbSize = 0;
- wave_format.nSamplesPerSec = mix_rate;
- wave_format.wFormatTag = WAVE_FORMAT_PCM;
- wave_format.wBitsPerSample = 16;
- wave_format.nBlockAlign = channels * wave_format.wBitsPerSample >> 3;
- wave_format.nAvgBytesPerSec = mix_rate * wave_format.nBlockAlign;
-
- voice_callback = memnew(XAudio2DriverVoiceCallback);
-
- hr = xaudio->CreateSourceVoice(&source_voice, &wave_format, 0, XAUDIO2_MAX_FREQ_RATIO, voice_callback);
- if (hr != S_OK) {
- ERR_EXPLAIN("Error creating XAudio2 source voice. " + itos(hr));
- ERR_FAIL_V(ERR_UNAVAILABLE);
- }
-
- mutex = Mutex::create();
- thread = Thread::create(AudioDriverWinRT::thread_func, this);
-
- return OK;
-};
-
-void AudioDriverWinRT::thread_func(void* p_udata) {
-
- AudioDriverWinRT* ad = (AudioDriverWinRT*)p_udata;
-
- uint64_t usdelay = (ad->buffer_size / float(ad->mix_rate)) * 1000000;
-
- while (!ad->exit_thread) {
-
-
- if (!ad->active) {
-
- for (int i = 0; i < AUDIO_BUFFERS; i++) {
- ad->xaudio_buffer[i].Flags = XAUDIO2_END_OF_STREAM;
- }
-
- } else {
-
- ad->lock();
-
- ad->audio_server_process(ad->buffer_size, ad->samples_in);
-
- ad->unlock();
-
- for (unsigned int i = 0;i < ad->buffer_size*ad->channels;i++) {
-
- ad->samples_out[ad->current_buffer][i] = ad->samples_in[i] >> 16;
- }
-
- ad->xaudio_buffer[ad->current_buffer].Flags = 0;
- ad->xaudio_buffer[ad->current_buffer].AudioBytes = ad->buffer_size * ad->channels * sizeof(int16_t);
- ad->xaudio_buffer[ad->current_buffer].pAudioData = (const BYTE*)(ad->samples_out[ad->current_buffer]);
- ad->xaudio_buffer[ad->current_buffer].PlayBegin = 0;
- ad->source_voice->SubmitSourceBuffer(&(ad->xaudio_buffer[ad->current_buffer]));
-
- ad->current_buffer = (ad->current_buffer + 1) % AUDIO_BUFFERS;
-
- XAUDIO2_VOICE_STATE state;
- while (ad->source_voice->GetState(&state), state.BuffersQueued > AUDIO_BUFFERS - 1)
- {
- WaitForSingleObject(ad->voice_callback->buffer_end_event, INFINITE);
- }
- }
-
- };
-
- ad->thread_exited = true;
-
-};
-
-void AudioDriverWinRT::start() {
-
- active = true;
- HRESULT hr = source_voice->Start(0);
- if (hr != S_OK) {
- ERR_EXPLAIN("XAudio2 start error " + itos(hr));
- ERR_FAIL();
- }
-};
-
-int AudioDriverWinRT::get_mix_rate() const {
-
- return mix_rate;
-};
-
-AudioDriverSW::OutputFormat AudioDriverWinRT::get_output_format() const {
-
- return output_format;
-};
-
-float AudioDriverWinRT::get_latency() {
-
- XAUDIO2_PERFORMANCE_DATA perf_data;
- xaudio->GetPerformanceData(&perf_data);
- if (perf_data.CurrentLatencyInSamples) {
- return (float)(perf_data.CurrentLatencyInSamples / ((float)mix_rate));
- } else {
- return 0;
- }
-}
-
-void AudioDriverWinRT::lock() {
-
- if (!thread || !mutex)
- return;
- mutex->lock();
-};
-void AudioDriverWinRT::unlock() {
-
- if (!thread || !mutex)
- return;
- mutex->unlock();
-};
-
-void AudioDriverWinRT::finish() {
-
- if (!thread)
- return;
-
- exit_thread = true;
- Thread::wait_to_finish(thread);
-
- if (source_voice) {
- source_voice->Stop(0);
- memdelete(source_voice);
- }
-
- if (samples_in) {
- memdelete_arr(samples_in);
- };
- if (samples_out[0]) {
- for (int i = 0; i < AUDIO_BUFFERS; i++) {
- memdelete_arr(samples_out[i]);
- }
- };
-
- memdelete(voice_callback);
- memdelete(mastering_voice);
-
- memdelete(thread);
- if (mutex)
- memdelete(mutex);
- thread = NULL;
-};
-
-AudioDriverWinRT::AudioDriverWinRT() {
-
- mutex = NULL;
- thread = NULL;
- wave_format = { 0 };
- for (int i = 0; i < AUDIO_BUFFERS; i++) {
- xaudio_buffer[i] = { 0 };
- samples_out[i] = 0;
- }
- current_buffer = 0;
-};
-
-AudioDriverWinRT::~AudioDriverWinRT() {
-
-
-};
-
-
diff --git a/platform/winrt/audio_driver_winrt.h b/platform/winrt/audio_driver_winrt.h
deleted file mode 100644
index d7a69994f8..0000000000
--- a/platform/winrt/audio_driver_winrt.h
+++ /dev/null
@@ -1,109 +0,0 @@
-/*************************************************************************/
-/* audio_driver_winrt.h */
-/*************************************************************************/
-/* This file is part of: */
-/* GODOT ENGINE */
-/* http://www.godotengine.org */
-/*************************************************************************/
-/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */
-/* */
-/* Permission is hereby granted, free of charge, to any person obtaining */
-/* a copy of this software and associated documentation files (the */
-/* "Software"), to deal in the Software without restriction, including */
-/* without limitation the rights to use, copy, modify, merge, publish, */
-/* distribute, sublicense, and/or sell copies of the Software, and to */
-/* permit persons to whom the Software is furnished to do so, subject to */
-/* the following conditions: */
-/* */
-/* The above copyright notice and this permission notice shall be */
-/* included in all copies or substantial portions of the Software. */
-/* */
-/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */
-/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */
-/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/
-/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */
-/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */
-/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
-/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
-/*************************************************************************/
-#ifndef AUDIO_DRIVER_WINRT_H
-#define AUDIO_DRIVER_WINRT_H
-
-#include "servers/audio/audio_server_sw.h"
-
-#include "core/os/thread.h"
-#include "core/os/mutex.h"
-
-#include <windows.h>
-#include <mmsystem.h>
-#include <mmreg.h>
-#include <xaudio2.h>
-#include <wrl/client.h>
-
-class AudioDriverWinRT : public AudioDriverSW {
-
- enum {
- AUDIO_BUFFERS = 2
- };
-
- struct XAudio2DriverVoiceCallback : public IXAudio2VoiceCallback {
-
- HANDLE buffer_end_event;
- XAudio2DriverVoiceCallback() : buffer_end_event(CreateEvent(NULL, FALSE, FALSE, NULL)) {}
- void STDMETHODCALLTYPE OnBufferEnd(void* pBufferContext) { /*print_line("buffer ended");*/ SetEvent(buffer_end_event); }
-
- //Unused methods are stubs
- void STDMETHODCALLTYPE OnStreamEnd() { }
- void STDMETHODCALLTYPE OnVoiceProcessingPassEnd() { }
- void STDMETHODCALLTYPE OnVoiceProcessingPassStart(UINT32 SamplesRequired) { }
- void STDMETHODCALLTYPE OnBufferStart(void * pBufferContext) { }
- void STDMETHODCALLTYPE OnLoopEnd(void * pBufferContext) { }
- void STDMETHODCALLTYPE OnVoiceError(void * pBufferContext, HRESULT Error) { }
-
- };
-
- Thread* thread;
- Mutex* mutex;
-
- int32_t* samples_in;
- int16_t* samples_out[AUDIO_BUFFERS];
-
- static void thread_func(void* p_udata);
- int buffer_size;
-
- unsigned int mix_rate;
- OutputFormat output_format;
-
- int channels;
-
- bool active;
- bool thread_exited;
- mutable bool exit_thread;
- bool pcm_open;
-
- WAVEFORMATEX wave_format;
- Microsoft::WRL::ComPtr<IXAudio2> xaudio;
- int current_buffer;
- IXAudio2MasteringVoice* mastering_voice;
- XAUDIO2_BUFFER xaudio_buffer[AUDIO_BUFFERS];
- IXAudio2SourceVoice* source_voice;
- XAudio2DriverVoiceCallback* voice_callback;
-
-public:
-
- const char* get_name() const;
-
- virtual Error init();
- virtual void start();
- virtual int get_mix_rate() const;
- virtual OutputFormat get_output_format() const;
- virtual float get_latency();
- virtual void lock();
- virtual void unlock();
- virtual void finish();
-
- AudioDriverWinRT();
- ~AudioDriverWinRT();
-};
-
-#endif
diff --git a/platform/winrt/detect.py b/platform/winrt/detect.py
index 79fc3651e9..a7bc62f685 100644
--- a/platform/winrt/detect.py
+++ b/platform/winrt/detect.py
@@ -31,6 +31,7 @@ def get_flags():
('tools', 'no'),
('builtin_zlib', 'yes'),
('openssl', 'builtin'),
+ ('xaudio2', 'yes'),
]
@@ -145,7 +146,6 @@ def configure(env):
env.Append(CCFLAGS=['/DGLES2_ENABLED','/DGL_GLEXT_PROTOTYPES','/DEGL_EGLEXT_PROTOTYPES','/DANGLE_ENABLED'])
LIBS = [
- 'xaudio2',
'WindowsApp',
'mincore',
'libANGLE',
diff --git a/platform/winrt/os_winrt.h b/platform/winrt/os_winrt.h
index 1816e0cec7..a4667f213d 100644
--- a/platform/winrt/os_winrt.h
+++ b/platform/winrt/os_winrt.h
@@ -40,7 +40,7 @@
#include "servers/spatial_sound/spatial_sound_server_sw.h"
#include "servers/spatial_sound_2d/spatial_sound_2d_server_sw.h"
#include "servers/physics_2d/physics_2d_server_sw.h"
-#include "audio_driver_winrt.h"
+#include "drivers/xaudio2/audio_driver_xaudio2.h"
#include "gl_context_egl.h"
@@ -118,7 +118,7 @@ private:
MainLoop *main_loop;
- AudioDriverWinRT audio_driver;
+ AudioDriverXAudio2 audio_driver;
AudioServerSW *audio_server;
SampleManagerMallocSW *sample_manager;
SpatialSoundServerSW *spatial_sound_server;
diff --git a/platform/x11/SCsub b/platform/x11/SCsub
index 80fd347ded..e20bd44f8d 100644
--- a/platform/x11/SCsub
+++ b/platform/x11/SCsub
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+
Import('env')
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index eb71ac7409..917a8a27d7 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -94,10 +94,6 @@ def configure(env):
env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
env.extra_suffix=".llvm"
- if (env["colored"]=="yes"):
- if sys.stdout.isatty():
- env.Append(CXXFLAGS=["-fcolor-diagnostics"])
-
if (env["use_sanitizer"]=="yes"):
env.Append(CXXFLAGS=['-fsanitize=address','-fno-omit-frame-pointer'])
env.Append(LINKFLAGS=['-fsanitize=address'])
generated by cgit v1.2.3 (git 2.25.1) at 2026-01-03 16:18:04 +0000