scons: Reorder options for clarity
Also prefix all thirdparty-related toggles with `builtin`.
This commit is contained in:
parent
cc54189911
commit
cc95d4448c
21 changed files with 89 additions and 84 deletions
|
|
@ -6,7 +6,7 @@ Import('env_modules')
|
|||
env_theora = env_modules.Clone()
|
||||
|
||||
# Thirdparty source files
|
||||
if (env["libtheora"] != "system"): # builtin
|
||||
if (env['builtin_libtheora'] != 'no'):
|
||||
thirdparty_dir = "#thirdparty/libtheora/"
|
||||
thirdparty_sources = [
|
||||
#"analyze.c",
|
||||
|
|
@ -74,9 +74,9 @@ if (env["libtheora"] != "system"): # builtin
|
|||
env_theora.Append(CPPPATH=[thirdparty_dir])
|
||||
|
||||
# also requires libogg and libvorbis
|
||||
if (env["libogg"] != "system"): # builtin
|
||||
if (env['builtin_libogg'] != 'no'):
|
||||
env_theora.Append(CPPPATH=["#thirdparty/libogg"])
|
||||
if (env["libvorbis"] != "system"): # builtin
|
||||
if (env['builtin_libvorbis'] != 'no'):
|
||||
env_theora.Append(CPPPATH=["#thirdparty/libvorbis"])
|
||||
|
||||
# Godot source files
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue