diff options
| author | Carl Hetherington <cth@carlh.net> | 2019-03-03 17:49:40 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2019-05-06 21:31:09 +0100 |
| commit | 6b4e9d00b4f3dbdc1315321b57bbdfbb69b99857 (patch) | |
| tree | fc959059e7a84af09016ae480e426b0241bd21fe /src | |
| parent | f5cfaa4dd9252dafb7e2b42420e3fc092d1d0a46 (diff) | |
Try to fix GL link on OS X.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wx/wscript | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/wx/wscript b/src/wx/wscript index 9ace0e9d3..67f19e67a 100644 --- a/src/wx/wscript +++ b/src/wx/wscript @@ -245,8 +245,12 @@ def configure(conf): define_name='DCPOMATIC_USE_RTERROR', mandatory=False) - conf.check_cfg(package='gl', args='--cflags --libs', uselib_store='GL', mandatory=True) - conf.check_cfg(package='glu', args='--cflags --libs', uselib_store='GLU', mandatory=True) + if conf.env.TARGET_WINDOWS or conf.env.TARGET_LINUX: + conf.check_cfg(package='gl', args='--cflags --libs', uselib_store='GL', mandatory=True) + conf.check_cfg(package='glu', args='--cflags --libs', uselib_store='GLU', mandatory=True) + else: + conf.env.STLIB_GL = 'gl' + conf.env.STLIB_GLU = 'glu def build(bld): @@ -263,7 +267,7 @@ def build(bld): if bld.env.TARGET_WINDOWS: obj.uselib += 'WINSOCK2 OLE32 DSOUND WINMM KSUSER ' if bld.env.TARGET_OSX: - obj.framework = ['CoreAudio'] + obj.framework = ['CoreAudio', 'OpenGL'] obj.use = 'libdcpomatic2' if bld.env.VARIANT == 'swaroop': obj.source = sources + " swaroop_controls.cc" |