mirror of https://github.com/kivy/kivy.git
setup.py: normalize c_options for x11 and mesagl. closes #1074
This commit is contained in:
parent
e36637d860
commit
7ce2cdf590
5
setup.py
5
setup.py
|
@ -19,7 +19,8 @@ c_options = {
|
||||||
'use_glew': False,
|
'use_glew': False,
|
||||||
'use_sdl': False,
|
'use_sdl': False,
|
||||||
'use_ios': False,
|
'use_ios': False,
|
||||||
'use_mesagl': 'USE_MESAGL' in environ}
|
'use_mesagl': False,
|
||||||
|
'use_x11': False}
|
||||||
|
|
||||||
# now check if environ is changing the default values
|
# now check if environ is changing the default values
|
||||||
for key in c_options.keys():
|
for key in c_options.keys():
|
||||||
|
@ -360,7 +361,7 @@ if platform in ('darwin', 'ios'):
|
||||||
sources['core/image/img_imageio.pyx'] = merge(
|
sources['core/image/img_imageio.pyx'] = merge(
|
||||||
base_flags, osx_flags)
|
base_flags, osx_flags)
|
||||||
|
|
||||||
if 'WITH_X11' in environ:
|
if c_options['use_x11']:
|
||||||
sources['core/window/window_x11.pyx'] = merge(
|
sources['core/window/window_x11.pyx'] = merge(
|
||||||
base_flags, gl_flags, graphics_flags, {
|
base_flags, gl_flags, graphics_flags, {
|
||||||
'depends': [join(dirname(__file__),
|
'depends': [join(dirname(__file__),
|
||||||
|
|
Loading…
Reference in New Issue