From 3a00179b3baf44372b495cd84c450d95e6a1f236 Mon Sep 17 00:00:00 2001
From: Relintai <relintai@protonmail.com>
Date: Sat, 15 May 2021 13:48:46 +0200
Subject: [PATCH] Moved the http server to a subfolder in core.

---
 SConstruct                      | 2 +-
 core/SCsub                      | 1 +
 core/{ => http}/http_server.cpp | 4 ++--
 core/{ => http}/http_server.h   | 0
 4 files changed, 4 insertions(+), 3 deletions(-)
 rename core/{ => http}/http_server.cpp (98%)
 rename core/{ => http}/http_server.h (100%)

diff --git a/SConstruct b/SConstruct
index fa2d584..e45852a 100644
--- a/SConstruct
+++ b/SConstruct
@@ -130,7 +130,7 @@ opts.Add("LINKFLAGS", "Custom flags for the linker")
 opts.Update(env_base)
 
 # add default include paths
-env_base.Prepend(CPPPATH=["#", "libs"])
+env_base.Prepend(CPPPATH=["#"])
 env_base.Prepend(CPPPATH=["#libs"])
 env_base.Prepend(LINKFLAGS=["-lpthread"])
 
diff --git a/core/SCsub b/core/SCsub
index 063d373..21daf46 100644
--- a/core/SCsub
+++ b/core/SCsub
@@ -5,6 +5,7 @@ Import("env")
 env.core_sources = []
 
 env.add_source_files(env.core_sources, "*.cpp")
+env.add_source_files(env.core_sources, "./http/*.cpp")
 
 # Build it all as a library
 lib = env.add_library("core", env.core_sources)
diff --git a/core/http_server.cpp b/core/http/http_server.cpp
similarity index 98%
rename from core/http_server.cpp
rename to core/http/http_server.cpp
index fe6d511..3736155 100644
--- a/core/http_server.cpp
+++ b/core/http/http_server.cpp
@@ -1,7 +1,7 @@
 #include "http_server.h"
 
-#include "application.h"
-#include "request.h"
+#include "core/application.h"
+#include "core/request.h"
 
 #define LOG_VERBOSE 0
 
diff --git a/core/http_server.h b/core/http/http_server.h
similarity index 100%
rename from core/http_server.h
rename to core/http/http_server.h