northern-lighthouse/godot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ogg/vorbis/opus: Make them modules and unbundle thirdparty libs

Browse Source 
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.
This commit is contained in:
Rémi Verschelde
2016-10-12 20:37:38 +02:00
parent ee3cf211c6
commit d9a291f641
408 changed files with 4225 additions and 1402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
platform/x11/detect.py
View File

@ -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'])