forked from godotengine/godot
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
theora: Move to a module and split thirdparty lib
Same rationale as the previous commits.
- Loading branch information
Showing
88 changed files
with
199 additions
and
178 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| Import('env') | ||
| Import('env_modules') | ||
|
|
||
| env_theora = env_modules.Clone() | ||
|
|
||
| # Thirdparty source files | ||
| if (env["libtheora"] != "system"): # builtin | ||
| thirdparty_dir = "#thirdparty/libtheora/" | ||
| thirdparty_sources = [ | ||
| "analyze.c", | ||
| "apiwrapper.c", | ||
| "bitpack.c", | ||
| "cpu.c", | ||
| "decapiwrapper.c", | ||
| "decinfo.c", | ||
| "decode.c", | ||
| "dequant.c", | ||
| "encapiwrapper.c", | ||
| "encfrag.c", | ||
| "encinfo.c", | ||
| "encode.c", | ||
| "encoder_disabled.c", | ||
| "enquant.c", | ||
| "fdct.c", | ||
| "fragment.c", | ||
| "huffdec.c", | ||
| "huffenc.c", | ||
| "idct.c", | ||
| "info.c", | ||
| "internal.c", | ||
| "mathops.c", | ||
| "mcenc.c", | ||
| "quant.c", | ||
| "rate.c", | ||
| "state.c", | ||
| "tokenize.c", | ||
| ] | ||
|
|
||
| thirdparty_sources_x86 = [ | ||
| "x86/mmxencfrag.c", | ||
| "x86/mmxfdct.c", | ||
| "x86/mmxfrag.c", | ||
| "x86/mmxidct.c", | ||
| "x86/mmxstate.c", | ||
| "x86/sse2fdct.c", | ||
| "x86/x86enc.c", | ||
| "x86/x86state.c", | ||
| ] | ||
|
|
||
| thirdparty_sources_x86_vc = [ | ||
| "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/x86state.c", | ||
| ] | ||
|
|
||
| if (env["x86_opt_gcc"]): | ||
| thirdparty_sources += thirdparty_sources_x86 | ||
|
|
||
| if (env["x86_opt_vc"]): | ||
| thirdparty_sources += thirdparty_sources_x86_vc | ||
|
|
||
| if (env["x86_opt_gcc"] or env["x86_opt_vc"]): | ||
| env_theora.Append(CCFLAGS = ["-DOC_X86_ASM"]) | ||
|
|
||
| thirdparty_sources = [thirdparty_dir + file for file in thirdparty_sources] | ||
|
|
||
| env_theora.add_source_files(env.modules_sources, thirdparty_sources) | ||
| env_theora.Append(CPPPATH = [thirdparty_dir]) | ||
|
|
||
| # also requires libogg and libvorbis | ||
| if (env["libogg"] != "system"): # builtin | ||
| env_theora.Append(CPPPATH = ["#thirdparty/libogg"]) | ||
| if (env["libvorbis"] != "system"): # builtin | ||
| env_theora.Append(CPPPATH = ["#thirdparty/libvorbis"]) | ||
|
|
||
| # Godot source files | ||
| env_theora.add_source_files(env.modules_sources, "*.cpp") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
|
|
||
| def can_build(platform): | ||
| return True | ||
|
|
||
| def configure(env): | ||
| pass |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /*************************************************************************/ | ||
| /* register_types.cpp */ | ||
| /*************************************************************************/ | ||
| /* This file is part of: */ | ||
| /* GODOT ENGINE */ | ||
| /* http://www.godotengine.org */ | ||
| /*************************************************************************/ | ||
| /* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ | ||
| /* */ | ||
| /* Permission is hereby granted, free of charge, to any person obtaining */ | ||
| /* a copy of this software and associated documentation files (the */ | ||
| /* "Software"), to deal in the Software without restriction, including */ | ||
| /* without limitation the rights to use, copy, modify, merge, publish, */ | ||
| /* distribute, sublicense, and/or sell copies of the Software, and to */ | ||
| /* permit persons to whom the Software is furnished to do so, subject to */ | ||
| /* the following conditions: */ | ||
| /* */ | ||
| /* The above copyright notice and this permission notice shall be */ | ||
| /* included in all copies or substantial portions of the Software. */ | ||
| /* */ | ||
| /* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ | ||
| /* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ | ||
| /* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ | ||
| /* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ | ||
| /* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ | ||
| /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ | ||
| /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
| /*************************************************************************/ | ||
| #include "register_types.h" | ||
|
|
||
| #include "video_stream_theora.h" | ||
|
|
||
| static ResourceFormatLoaderVideoStreamTheora* theora_stream_loader = NULL; | ||
|
|
||
| void register_theora_types() { | ||
|
|
||
| theora_stream_loader = memnew( ResourceFormatLoaderVideoStreamTheora ); | ||
| ResourceLoader::add_resource_format_loader(theora_stream_loader); | ||
| ObjectTypeDB::register_type<VideoStreamTheora>(); | ||
| } | ||
|
|
||
| void unregister_theora_types() { | ||
|
|
||
| memdelete( theora_stream_loader ); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| /*************************************************************************/ | ||
| /* register_types.h */ | ||
| /*************************************************************************/ | ||
| /* This file is part of: */ | ||
| /* GODOT ENGINE */ | ||
| /* http://www.godotengine.org */ | ||
| /*************************************************************************/ | ||
| /* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ | ||
| /* */ | ||
| /* Permission is hereby granted, free of charge, to any person obtaining */ | ||
| /* a copy of this software and associated documentation files (the */ | ||
| /* "Software"), to deal in the Software without restriction, including */ | ||
| /* without limitation the rights to use, copy, modify, merge, publish, */ | ||
| /* distribute, sublicense, and/or sell copies of the Software, and to */ | ||
| /* permit persons to whom the Software is furnished to do so, subject to */ | ||
| /* the following conditions: */ | ||
| /* */ | ||
| /* The above copyright notice and this permission notice shall be */ | ||
| /* included in all copies or substantial portions of the Software. */ | ||
| /* */ | ||
| /* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ | ||
| /* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ | ||
| /* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ | ||
| /* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ | ||
| /* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ | ||
| /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ | ||
| /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | ||
| /*************************************************************************/ | ||
| void register_theora_types(); | ||
| void unregister_theora_types(); |
Oops, something went wrong.