mirror of
https://github.com/wxWidgets/Phoenix.git
synced 2026-01-05 11:30:06 +01:00
Let --with-opengl default to automatic, don't link with the lib if it wasn't built.
This commit is contained in:
@@ -280,7 +280,6 @@ def main(wxDir, args):
|
||||
configure_opts.append("--with-gtk=2")
|
||||
|
||||
wxpy_configure_opts = [
|
||||
"--with-opengl",
|
||||
"--enable-sound",
|
||||
"--enable-graphics_ctx",
|
||||
"--enable-display",
|
||||
|
||||
6
wscript
6
wscript
@@ -221,8 +221,12 @@ def configure(conf):
|
||||
uselib_store='WXHTML', mandatory=True,
|
||||
msg='Finding libs for WXHTML')
|
||||
|
||||
if cfg.checkSetup(wxConfigDir, 'wxUSE_GLCANVAS'):
|
||||
gl_libs = '--libs gl,core,net'
|
||||
else:
|
||||
gl_libs = '--libs core,net'
|
||||
conf.check_cfg(path=conf.options.wx_config, package='',
|
||||
args='--cxxflags --libs gl,core,net' + rpath,
|
||||
args='--cxxflags ' + gl_libs + rpath,
|
||||
uselib_store='WXGL', mandatory=True,
|
||||
msg='Finding libs for WXGL')
|
||||
|
||||
|
||||
Reference in New Issue
Block a user