diff options
| author | Rémi Verschelde <rverschelde@gmail.com> | 2016-10-13 19:40:40 +0200 |
|---|---|---|
| committer | Rémi Verschelde <rverschelde@gmail.com> | 2016-10-15 11:50:41 +0200 |
| commit | cfcc8a20e862b758c32bd3f152186e6df0591a24 (patch) | |
| tree | e9cf6ebad67c17ae60b8beb4d1468cbc94dbb982 /platform | |
| parent | da09c6131bcdace7e8e62c3dabc62890e9564c97 (diff) | |
theora: Move to a module and split thirdparty lib
Same rationale as the previous commits.
Diffstat (limited to 'platform')
| -rw-r--r-- | platform/bb10/detect.py | 3 | ||||
| -rw-r--r-- | platform/javascript/detect.py | 2 | ||||
| -rw-r--r-- | platform/x11/detect.py | 17 |
3 files changed, 14 insertions, 8 deletions
diff --git a/platform/bb10/detect.py b/platform/bb10/detect.py index 2860b7f090..5aa68b36dc 100644 --- a/platform/bb10/detect.py +++ b/platform/bb10/detect.py @@ -33,8 +33,7 @@ def get_flags(): return [ ('tools', 'no'), - ('theora', 'no'), - + ('module_theora_enabled', 'no'), ] def configure(env): diff --git a/platform/javascript/detect.py b/platform/javascript/detect.py index f80c3b4915..fce680b002 100644 --- a/platform/javascript/detect.py +++ b/platform/javascript/detect.py @@ -26,10 +26,10 @@ def get_flags(): return [ ('tools', 'no'), - ('theora', 'no'), ('musepack', 'no'), ('squish', 'no'), ('etc1', 'no'), + ('module_theora_enabled', 'no'), ] diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 98c2d1e8fd..7c22bd97ff 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -73,7 +73,6 @@ def get_flags(): ("openssl", "system"), ('freetype','yes'), # use system freetype ('libpng', 'system'), - #("theora","no"), ] @@ -155,16 +154,24 @@ 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') + # Sound and video libraries + # Keep the order as it triggers chained dependencies (ogg needed by others, etc.) + + if (env["libtheora"] == "system"): + env["libogg"] = "system" # Needed to link against system libtheora + env["libvorbis"] = "system" # Needed to link against system libtheora + env.ParseConfig('pkg-config theora theoradec --cflags --libs') if (env["libvorbis"] == "system"): env["libogg"] = "system" # Needed to link against system libvorbis - env.ParseConfig('pkg-config vorbis vorbisfile ogg --cflags --libs') + env.ParseConfig('pkg-config vorbis vorbisfile --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.ParseConfig('pkg-config opus opusfile --cflags --libs') + + if (env["libogg"] == "system"): + env.ParseConfig('pkg-config ogg --cflags --libs') env.Append(CPPFLAGS=['-DOPENGL_ENABLED']) |