From b1fba2e013e0dc53dec7406e5db4fbc65ad17a94 Mon Sep 17 00:00:00 2001
From: J08nY <johny@neuromancer.sk>
Date: Sat, 1 Oct 2016 22:04:10 +0200
Subject: [PATCH] PCKPacker: moved from tools into core, fixes #4129

---
 {tools/pck => core/io}/pck_packer.cpp | 0
 {tools/pck => core/io}/pck_packer.h   | 0
 core/register_core_types.cpp          | 3 +++
 main/main.cpp                         | 4 +---
 tools/SCsub                           | 1 -
 tools/pck/SCsub                       | 4 ----
 6 files changed, 4 insertions(+), 8 deletions(-)
 rename {tools/pck => core/io}/pck_packer.cpp (100%)
 rename {tools/pck => core/io}/pck_packer.h (100%)
 delete mode 100644 tools/pck/SCsub

diff --git a/tools/pck/pck_packer.cpp b/core/io/pck_packer.cpp
similarity index 100%
rename from tools/pck/pck_packer.cpp
rename to core/io/pck_packer.cpp
diff --git a/tools/pck/pck_packer.h b/core/io/pck_packer.h
similarity index 100%
rename from tools/pck/pck_packer.h
rename to core/io/pck_packer.h
diff --git a/core/register_core_types.cpp b/core/register_core_types.cpp
index 7e4ba039c5e..c3a127afb9d 100644
--- a/core/register_core_types.cpp
+++ b/core/register_core_types.cpp
@@ -49,6 +49,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"
@@ -146,6 +147,8 @@ void register_core_types() {
 
 	ObjectTypeDB::register_type<ConfigFile>();
 
+	ObjectTypeDB::register_type<PCKPacker>();
+
 	ObjectTypeDB::register_type<PackedDataContainer>();
 	ObjectTypeDB::register_virtual_type<PackedDataContainerRef>();
 	ObjectTypeDB::register_type<AStar>();
diff --git a/main/main.cpp b/main/main.cpp
index d2ba38b0949..cd6858fc241 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"
@@ -996,7 +995,7 @@ Error Main::setup2() {
 #ifdef TOOLS_ENABLED
 	ObjectTypeDB::set_current_api(ObjectTypeDB::API_EDITOR);
 	EditorNode::register_editor_types();
-	ObjectTypeDB::register_type<PCKPacker>(); // todo: move somewhere else
+
 	ObjectTypeDB::set_current_api(ObjectTypeDB::API_CORE);
 
 #endif
@@ -1755,4 +1754,3 @@ void Main::cleanup() {
 
 
 }
-
diff --git a/tools/SCsub b/tools/SCsub
index aaebab724a4..67b1f20e72b 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 cf98ae145d1..00000000000
--- a/tools/pck/SCsub
+++ /dev/null
@@ -1,4 +0,0 @@
-Import('env')
-
-if env["tools"] == "yes":
-	env.add_source_files(env.tool_sources, "*.cpp")