PCKPacker: moved from tools into core, fixes #4129

(cherry picked from commit b1fba2e013e0dc53dec7406e5db4fbc65ad17a94)

6 files changed, 3 insertions, 8 deletions

diff --git a/tools/pck/pck_packer.cpp b/core/io/pck_packer.cpp
index 04b88ea02..04b88ea02 100644
--- a/tools/pck/pck_packer.cpp
+++ b/core/io/pck_packer.cpp
diff --git a/tools/pck/pck_packer.h b/core/io/pck_packer.h
index b1182335e..b1182335e 100644
--- a/tools/pck/pck_packer.h
+++ b/core/io/pck_packer.h
diff --git a/core/register_core_types.cpp b/core/register_core_types.cpp
index 97bd5f2a3..5213e1157 100644
--- a/core/register_core_types.cpp
+++ b/core/register_core_types.cpp
@@ -48,6 +48,7 @@
 #include "os/input.h"
 #include "core/io/xml_parser.h"
 #include "io/http_client.h"
+#include "io/pck_packer.h"
 #include "packed_data_container.h"
 #include "func_ref.h"
 #include "input_map.h"
@@ -144,6 +145,8 @@ void register_core_types() {
 
 	ObjectTypeDB::register_type<ConfigFile>();
 
+	ObjectTypeDB::register_type<PCKPacker>();
+
 	ObjectTypeDB::register_type<PackedDataContainer>();
 	ObjectTypeDB::register_virtual_type<PackedDataContainerRef>();
 
diff --git a/main/main.cpp b/main/main.cpp
index aa8540632..3baf9e57e 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -57,7 +57,6 @@
 #include "tools/editor/editor_node.h"
 #include "tools/editor/project_manager.h"
 
-#include "tools/pck/pck_packer.h"
 #endif
 
 #include "io/file_access_network.h"
@@ -995,7 +994,6 @@ Error Main::setup2() {
 	}
 #ifdef TOOLS_ENABLED
 	EditorNode::register_editor_types();
-	ObjectTypeDB::register_type<PCKPacker>(); // todo: move somewhere else
 #endif
 
 	MAIN_PRINT("Main: Load Scripts, Modules, Drivers");
@@ -1747,4 +1745,3 @@ void Main::cleanup() {
 
 
 }
-
diff --git a/tools/SCsub b/tools/SCsub
index aaebab724..67b1f20e7 100644
--- a/tools/SCsub
+++ b/tools/SCsub
@@ -117,7 +117,6 @@ if (env["tools"]!="no"):
 	SConscript('editor/SCsub');
 	SConscript('collada/SCsub');
 	SConscript('doc/SCsub')
-	SConscript('pck/SCsub')
 
 	lib = env.Library("tool",env.tool_sources)
 
diff --git a/tools/pck/SCsub b/tools/pck/SCsub
deleted file mode 100644
index cf98ae145..000000000
--- a/tools/pck/SCsub
+++ /dev/null
@@ -1,4 +0,0 @@
-Import('env')
-
-if env["tools"] == "yes":
-	env.add_source_files(env.tool_sources, "*.cpp")