diff --git a/drivers/SCsub b/drivers/SCsub index edab83cd869..4ae42a33d5d 100644 --- a/drivers/SCsub +++ b/drivers/SCsub @@ -21,7 +21,6 @@ if ("builtin_zlib" in env and env["builtin_zlib"] == "yes"): if (env["platform"] == "windows"): SConscript("rtaudio/SCsub"); SConscript("nrex/SCsub"); -SConscript("chibi/SCsub"); if (env["tools"]=="yes"): SConscript("convex_decomp/SCsub"); diff --git a/drivers/chibi/SCsub b/drivers/chibi/SCsub deleted file mode 100644 index 9fbb467baa1..00000000000 --- a/drivers/chibi/SCsub +++ /dev/null @@ -1,5 +0,0 @@ -Import('env') - -env.add_source_files(env.drivers_sources,"*.cpp") - -Export('env') diff --git a/drivers/register_driver_types.cpp b/drivers/register_driver_types.cpp index 31d53e0185a..7486d4f217d 100644 --- a/drivers/register_driver_types.cpp +++ b/drivers/register_driver_types.cpp @@ -31,7 +31,6 @@ #include "core/math/geometry.h" #include "png/image_loader_png.h" #include "png/resource_saver_png.h" -#include "chibi/event_stream_chibi.h" #ifdef TOOLS_ENABLED #include "convex_decomp/b2d_decompose.h" @@ -70,14 +69,9 @@ void unregister_core_driver_types() { void register_driver_types() { #ifdef TOOLS_ENABLED - Geometry::_decompose_func=b2d_decompose; #endif - - initialize_chibi(); } void unregister_driver_types() { - - finalize_chibi(); } diff --git a/modules/chibi/SCsub b/modules/chibi/SCsub new file mode 100644 index 00000000000..e39554977ab --- /dev/null +++ b/modules/chibi/SCsub @@ -0,0 +1,7 @@ +Import('env') +Import('env_modules') + +env_chibi = env_modules.Clone() + +# Godot source files +env_chibi.add_source_files(env.modules_sources, "*.cpp") diff --git a/modules/chibi/config.py b/modules/chibi/config.py new file mode 100644 index 00000000000..368e97e152c --- /dev/null +++ b/modules/chibi/config.py @@ -0,0 +1,6 @@ + +def can_build(platform): + return True + +def configure(env): + pass diff --git a/drivers/chibi/cp_config.h b/modules/chibi/cp_config.h similarity index 100% rename from drivers/chibi/cp_config.h rename to modules/chibi/cp_config.h diff --git a/drivers/chibi/cp_envelope.cpp b/modules/chibi/cp_envelope.cpp similarity index 100% rename from drivers/chibi/cp_envelope.cpp rename to modules/chibi/cp_envelope.cpp diff --git a/drivers/chibi/cp_envelope.h b/modules/chibi/cp_envelope.h similarity index 100% rename from drivers/chibi/cp_envelope.h rename to modules/chibi/cp_envelope.h diff --git a/drivers/chibi/cp_file_access_wrapper.h b/modules/chibi/cp_file_access_wrapper.h similarity index 100% rename from drivers/chibi/cp_file_access_wrapper.h rename to modules/chibi/cp_file_access_wrapper.h diff --git a/drivers/chibi/cp_instrument.cpp b/modules/chibi/cp_instrument.cpp similarity index 100% rename from drivers/chibi/cp_instrument.cpp rename to modules/chibi/cp_instrument.cpp diff --git a/drivers/chibi/cp_instrument.h b/modules/chibi/cp_instrument.h similarity index 100% rename from drivers/chibi/cp_instrument.h rename to modules/chibi/cp_instrument.h diff --git a/drivers/chibi/cp_loader.h b/modules/chibi/cp_loader.h similarity index 100% rename from drivers/chibi/cp_loader.h rename to modules/chibi/cp_loader.h diff --git a/drivers/chibi/cp_loader_it.cpp b/modules/chibi/cp_loader_it.cpp similarity index 100% rename from drivers/chibi/cp_loader_it.cpp rename to modules/chibi/cp_loader_it.cpp diff --git a/drivers/chibi/cp_loader_it.h b/modules/chibi/cp_loader_it.h similarity index 100% rename from drivers/chibi/cp_loader_it.h rename to modules/chibi/cp_loader_it.h diff --git a/drivers/chibi/cp_loader_it_info.cpp b/modules/chibi/cp_loader_it_info.cpp similarity index 100% rename from drivers/chibi/cp_loader_it_info.cpp rename to modules/chibi/cp_loader_it_info.cpp diff --git a/drivers/chibi/cp_loader_it_instruments.cpp b/modules/chibi/cp_loader_it_instruments.cpp similarity index 100% rename from drivers/chibi/cp_loader_it_instruments.cpp rename to modules/chibi/cp_loader_it_instruments.cpp diff --git a/drivers/chibi/cp_loader_it_patterns.cpp b/modules/chibi/cp_loader_it_patterns.cpp similarity index 100% rename from drivers/chibi/cp_loader_it_patterns.cpp rename to modules/chibi/cp_loader_it_patterns.cpp diff --git a/drivers/chibi/cp_loader_it_samples.cpp b/modules/chibi/cp_loader_it_samples.cpp similarity index 100% rename from drivers/chibi/cp_loader_it_samples.cpp rename to modules/chibi/cp_loader_it_samples.cpp diff --git a/drivers/chibi/cp_loader_mod.cpp b/modules/chibi/cp_loader_mod.cpp similarity index 100% rename from drivers/chibi/cp_loader_mod.cpp rename to modules/chibi/cp_loader_mod.cpp diff --git a/drivers/chibi/cp_loader_mod.h b/modules/chibi/cp_loader_mod.h similarity index 100% rename from drivers/chibi/cp_loader_mod.h rename to modules/chibi/cp_loader_mod.h diff --git a/drivers/chibi/cp_loader_s3m.cpp b/modules/chibi/cp_loader_s3m.cpp similarity index 100% rename from drivers/chibi/cp_loader_s3m.cpp rename to modules/chibi/cp_loader_s3m.cpp diff --git a/drivers/chibi/cp_loader_s3m.h b/modules/chibi/cp_loader_s3m.h similarity index 100% rename from drivers/chibi/cp_loader_s3m.h rename to modules/chibi/cp_loader_s3m.h diff --git a/drivers/chibi/cp_loader_xm.cpp b/modules/chibi/cp_loader_xm.cpp similarity index 100% rename from drivers/chibi/cp_loader_xm.cpp rename to modules/chibi/cp_loader_xm.cpp diff --git a/drivers/chibi/cp_loader_xm.h b/modules/chibi/cp_loader_xm.h similarity index 100% rename from drivers/chibi/cp_loader_xm.h rename to modules/chibi/cp_loader_xm.h diff --git a/drivers/chibi/cp_mixer.h b/modules/chibi/cp_mixer.h similarity index 100% rename from drivers/chibi/cp_mixer.h rename to modules/chibi/cp_mixer.h diff --git a/drivers/chibi/cp_note.h b/modules/chibi/cp_note.h similarity index 100% rename from drivers/chibi/cp_note.h rename to modules/chibi/cp_note.h diff --git a/drivers/chibi/cp_order.h b/modules/chibi/cp_order.h similarity index 100% rename from drivers/chibi/cp_order.h rename to modules/chibi/cp_order.h diff --git a/drivers/chibi/cp_pattern.cpp b/modules/chibi/cp_pattern.cpp similarity index 100% rename from drivers/chibi/cp_pattern.cpp rename to modules/chibi/cp_pattern.cpp diff --git a/drivers/chibi/cp_pattern.h b/modules/chibi/cp_pattern.h similarity index 100% rename from drivers/chibi/cp_pattern.h rename to modules/chibi/cp_pattern.h diff --git a/drivers/chibi/cp_player_data.cpp b/modules/chibi/cp_player_data.cpp similarity index 100% rename from drivers/chibi/cp_player_data.cpp rename to modules/chibi/cp_player_data.cpp diff --git a/drivers/chibi/cp_player_data.h b/modules/chibi/cp_player_data.h similarity index 100% rename from drivers/chibi/cp_player_data.h rename to modules/chibi/cp_player_data.h diff --git a/drivers/chibi/cp_player_data_control.cpp b/modules/chibi/cp_player_data_control.cpp similarity index 100% rename from drivers/chibi/cp_player_data_control.cpp rename to modules/chibi/cp_player_data_control.cpp diff --git a/drivers/chibi/cp_player_data_effects.cpp b/modules/chibi/cp_player_data_effects.cpp similarity index 100% rename from drivers/chibi/cp_player_data_effects.cpp rename to modules/chibi/cp_player_data_effects.cpp diff --git a/drivers/chibi/cp_player_data_envelopes.cpp b/modules/chibi/cp_player_data_envelopes.cpp similarity index 100% rename from drivers/chibi/cp_player_data_envelopes.cpp rename to modules/chibi/cp_player_data_envelopes.cpp diff --git a/drivers/chibi/cp_player_data_events.cpp b/modules/chibi/cp_player_data_events.cpp similarity index 100% rename from drivers/chibi/cp_player_data_events.cpp rename to modules/chibi/cp_player_data_events.cpp diff --git a/drivers/chibi/cp_player_data_filter.cpp b/modules/chibi/cp_player_data_filter.cpp similarity index 100% rename from drivers/chibi/cp_player_data_filter.cpp rename to modules/chibi/cp_player_data_filter.cpp diff --git a/drivers/chibi/cp_player_data_nna.cpp b/modules/chibi/cp_player_data_nna.cpp similarity index 100% rename from drivers/chibi/cp_player_data_nna.cpp rename to modules/chibi/cp_player_data_nna.cpp diff --git a/drivers/chibi/cp_player_data_notes.cpp b/modules/chibi/cp_player_data_notes.cpp similarity index 100% rename from drivers/chibi/cp_player_data_notes.cpp rename to modules/chibi/cp_player_data_notes.cpp diff --git a/drivers/chibi/cp_player_data_utils.cpp b/modules/chibi/cp_player_data_utils.cpp similarity index 100% rename from drivers/chibi/cp_player_data_utils.cpp rename to modules/chibi/cp_player_data_utils.cpp diff --git a/drivers/chibi/cp_sample.cpp b/modules/chibi/cp_sample.cpp similarity index 100% rename from drivers/chibi/cp_sample.cpp rename to modules/chibi/cp_sample.cpp diff --git a/drivers/chibi/cp_sample.h b/modules/chibi/cp_sample.h similarity index 100% rename from drivers/chibi/cp_sample.h rename to modules/chibi/cp_sample.h diff --git a/drivers/chibi/cp_sample_defs.h b/modules/chibi/cp_sample_defs.h similarity index 100% rename from drivers/chibi/cp_sample_defs.h rename to modules/chibi/cp_sample_defs.h diff --git a/drivers/chibi/cp_sample_manager.cpp b/modules/chibi/cp_sample_manager.cpp similarity index 100% rename from drivers/chibi/cp_sample_manager.cpp rename to modules/chibi/cp_sample_manager.cpp diff --git a/drivers/chibi/cp_sample_manager.h b/modules/chibi/cp_sample_manager.h similarity index 100% rename from drivers/chibi/cp_sample_manager.h rename to modules/chibi/cp_sample_manager.h diff --git a/drivers/chibi/cp_song.cpp b/modules/chibi/cp_song.cpp similarity index 100% rename from drivers/chibi/cp_song.cpp rename to modules/chibi/cp_song.cpp diff --git a/drivers/chibi/cp_song.h b/modules/chibi/cp_song.h similarity index 100% rename from drivers/chibi/cp_song.h rename to modules/chibi/cp_song.h diff --git a/drivers/chibi/cp_tables.cpp b/modules/chibi/cp_tables.cpp similarity index 100% rename from drivers/chibi/cp_tables.cpp rename to modules/chibi/cp_tables.cpp diff --git a/drivers/chibi/cp_tables.h b/modules/chibi/cp_tables.h similarity index 100% rename from drivers/chibi/cp_tables.h rename to modules/chibi/cp_tables.h diff --git a/drivers/chibi/event_stream_chibi.cpp b/modules/chibi/event_stream_chibi.cpp similarity index 100% rename from drivers/chibi/event_stream_chibi.cpp rename to modules/chibi/event_stream_chibi.cpp diff --git a/drivers/chibi/event_stream_chibi.h b/modules/chibi/event_stream_chibi.h similarity index 100% rename from drivers/chibi/event_stream_chibi.h rename to modules/chibi/event_stream_chibi.h diff --git a/modules/chibi/register_types.cpp b/modules/chibi/register_types.cpp new file mode 100644 index 00000000000..b2ba16fa03a --- /dev/null +++ b/modules/chibi/register_types.cpp @@ -0,0 +1,41 @@ +/*************************************************************************/ +/* 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 "event_stream_chibi.h" + +void register_chibi_types() { + + initialize_chibi(); +} + +void unregister_chibi_types() { + + finalize_chibi(); +} diff --git a/modules/chibi/register_types.h b/modules/chibi/register_types.h new file mode 100644 index 00000000000..159823b85d1 --- /dev/null +++ b/modules/chibi/register_types.h @@ -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_chibi_types(); +void unregister_chibi_types();