summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorRĂ©mi Verschelde <remi@verschelde.fr>2016-10-16 23:02:30 +0200
committerGitHub <noreply@github.com>2016-10-16 23:02:30 +0200
commit73cb001e4917cea0521a9417a9242f7c2cebcd38 (patch)
treeb27f6f54ea16f798def5e652b54e73fdd0ee358f /modules
parent89132224a651c0e0d4121270f63decb9a678ff88 (diff)
parent4ffa8f224d8d57520bd4953d67291c83152cd5e5 (diff)
Merge pull request #6848 from zaps166/x86_libtheora_opt
Theora: Don't compile unnecessary files, rename "x86_opt_*"
Diffstat (limited to 'modules')
-rw-r--r--modules/theora/SCsub50
1 files changed, 25 insertions, 25 deletions
diff --git a/modules/theora/SCsub b/modules/theora/SCsub
index cdb78e955e..cf1a8e6707 100644
--- a/modules/theora/SCsub
+++ b/modules/theora/SCsub
@@ -7,63 +7,63 @@ env_theora = env_modules.Clone()
if (env["libtheora"] != "system"): # builtin
thirdparty_dir = "#thirdparty/libtheora/"
thirdparty_sources = [
- "analyze.c",
- "apiwrapper.c",
+ #"analyze.c",
+ #"apiwrapper.c",
"bitpack.c",
"cpu.c",
- "decapiwrapper.c",
+ #"decapiwrapper.c",
"decinfo.c",
"decode.c",
"dequant.c",
- "encapiwrapper.c",
- "encfrag.c",
- "encinfo.c",
- "encode.c",
- "encoder_disabled.c",
- "enquant.c",
- "fdct.c",
+ #"encapiwrapper.c",
+ #"encfrag.c",
+ #"encinfo.c",
+ #"encode.c",
+ #"encoder_disabled.c",
+ #"enquant.c",
+ #"fdct.c",
"fragment.c",
"huffdec.c",
- "huffenc.c",
+ #"huffenc.c",
"idct.c",
"info.c",
"internal.c",
- "mathops.c",
- "mcenc.c",
+ #"mathops.c",
+ #"mcenc.c",
"quant.c",
- "rate.c",
+ #"rate.c",
"state.c",
- "tokenize.c",
+ #"tokenize.c",
]
thirdparty_sources_x86 = [
- "x86/mmxencfrag.c",
- "x86/mmxfdct.c",
+ #"x86/mmxencfrag.c",
+ #"x86/mmxfdct.c",
"x86/mmxfrag.c",
"x86/mmxidct.c",
"x86/mmxstate.c",
- "x86/sse2fdct.c",
- "x86/x86enc.c",
+ #"x86/sse2fdct.c",
+ #"x86/x86enc.c",
"x86/x86state.c",
]
thirdparty_sources_x86_vc = [
- "x86_vc/mmxencfrag.c",
- "x86_vc/mmxfdct.c",
+ #"x86_vc/mmxencfrag.c",
+ #"x86_vc/mmxfdct.c",
"x86_vc/mmxfrag.c",
"x86_vc/mmxidct.c",
"x86_vc/mmxstate.c",
- "x86_vc/x86enc.c",
+ #"x86_vc/x86enc.c",
"x86_vc/x86state.c",
]
- if (env["x86_opt_gcc"]):
+ if (env["x86_libtheora_opt_gcc"]):
thirdparty_sources += thirdparty_sources_x86
- if (env["x86_opt_vc"]):
+ if (env["x86_libtheora_opt_vc"]):
thirdparty_sources += thirdparty_sources_x86_vc
- if (env["x86_opt_gcc"] or env["x86_opt_vc"]):
+ if (env["x86_libtheora_opt_gcc"] or env["x86_libtheora_opt_vc"]):
env_theora.Append(CCFLAGS = ["-DOC_X86_ASM"])
thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources]