diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-10-12 20:37:38 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2016-10-15 11:50:40 +0200 |
| commit | d9a291f6411f2e571c181da0ac89f550ba73f681 (patch) | |
| tree | a560b8263d9ab896a05087eb20d5eeefdeb89969 /platform/x11/detect.py | |
| parent | ee3cf211c6fd4d1e30617467cdbbe945798a68b3 (diff) | |
| download | redot-engine-d9a291f6411f2e571c181da0ac89f550ba73f681.tar.gz | |
ogg/vorbis/opus: Make them modules and unbundle thirdparty libs
Took the opportunity to undo the Godot changed made to the
opus source. The opus module should eventually be built in its
own environment to avoid polluting others with too many include
dirs and defines.
TODO: Fix the platform/ stuff for opus.
Diffstat (limited to 'platform/x11/detect.py')
| -rw-r--r-- | platform/x11/detect.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 6a5ca84cbe..8a156a6bce 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -155,6 +155,17 @@ def configure(env): if (env["enet"] == "system"): env.ParseConfig('pkg-config libenet --cflags --libs') + if (env["libogg"] == "system"): + env.ParseConfig('pkg-config ogg --cflags --libs') + + if (env["libvorbis"] == "system"): + env["libogg"] = "system" # Needed to link against system libvorbis + env.ParseConfig('pkg-config vorbis vorbisfile ogg --cflags --libs') + + if (env["opus"] == "system"): + env["libogg"] = "system" # Needed to link against system opus + env.ParseConfig('pkg-config opus opusfile ogg --cflags --libs') + env.Append(CPPFLAGS=['-DOPENGL_ENABLED']) |