Remove threaded_gl_init in favor of OS detection

This commit is contained in:
Struma 2020-11-12 23:15:58 -05:00 committed by zzoro
parent e86548b6ba
commit 48cbeb55ab
2 changed files with 1 additions and 3 deletions

View file

@ -115,8 +115,7 @@ if get_option('static_executable') == true and host_system == 'windows'
build_static = true
endif
# This MUST be disabled if building for macOS >= 10.15
if get_option('threaded_gl_init')
if host_system != 'darwin' or run_command('sw_vers', '-productVersion').stdout().version_compare('<10.15')
global_args += '-DTHREADED_GLINIT'
endif

View file

@ -6,7 +6,6 @@ option('mri_library', type: 'string', value: '', description: 'Ruby manual link
option('mk', type: 'boolean', value: false, description: 'Build to fit Marin\'s MK standard')
option('console', type: 'boolean', value: false, description: 'Whether to debug information in the console')
option('macos_min_version', type: 'string', value: '10.12', description: 'Minimum macOS system version to support')
option('threaded_gl_init', type: 'boolean', value: true, description: 'Init GL on secondary thread')
option('force32', type: 'boolean', value: false, description: 'Force compiler to build a 32-bit executable')
option('shared_fluid', type: 'boolean', value: false, description: 'Dynamically link fluidsynth at build time')