Moved core/hash into a new crypto/hash folder. Also cleaned up core/SCsub.

SConstruct

@@ -274,6 +274,7 @@ if scons_ver >= (4, 0, 0):
 Export("env")
 
 SConscript("core/SCsub")
+SConscript("crypto/SCsub")
 SConscript("web/SCsub")
 SConscript("platform/SCsub")
 

backends/hash_hashlib/hlib_sha256.h

@@ -1,7 +1,7 @@
 #ifndef HASHLIB_SHA256_H
 #define HASHLIB_SHA256_H
 
-#include "core/hash/sha256.h"
+#include "crypto/hash/sha256.h"
 
 #include "./hash-library/sha256.h"
 

core/SCsub

@@ -8,11 +8,6 @@ env.add_source_files(env.core_sources, "*.cpp")
 env.add_source_files(env.core_sources, "./math/*.cpp")
 env.add_source_files(env.core_sources, "./containers/*.cpp")
 env.add_source_files(env.core_sources, "./log/*.cpp")
-env.add_source_files(env.core_sources, "./html/*.cpp")
-env.add_source_files(env.core_sources, "./http/*.cpp")
-env.add_source_files(env.core_sources, "./hash/*.cpp")
-env.add_source_files(env.core_sources, "./bry_http/*.cpp")
-env.add_source_files(env.core_sources, "./database/*.cpp")
 env.add_source_files(env.core_sources, "./os/*.cpp")
 env.add_source_files(env.core_sources, "./image/*.cpp")
 env.add_source_files(env.core_sources, "./threading/*.cpp")

crypto/SCsub

@@ -0,0 +1,12 @@
+#!/usr/bin/env python
+
+Import("env")
+
+env.core_sources = []
+
+env.add_source_files(env.core_sources, "*.cpp")
+env.add_source_files(env.core_sources, "./hash/*.cpp")
+
+# Build it all as a library
+lib = env.add_library("core", env.core_sources)
+env.Prepend(LIBS=[lib])

web/http/csrf_token.cpp

@@ -1,6 +1,6 @@
 #include "csrf_token.h"
 
-#include "core/hash/sha256.h"
+#include "crypto/hash/sha256.h"
 #include "http_session.h"
 #include "request.h"
 #include <time.h>

web/http/session_manager.cpp

@@ -9,7 +9,7 @@
 #include "database/query_result.h"
 #include "database/table_builder.h"
 
-#include "core/hash/sha256.h"
+#include "crypto/hash/sha256.h"
 
 #include "request.h"
 

web_modules/users/user_controller.cpp

@@ -13,7 +13,7 @@
 #include "database/query_result.h"
 #include "database/table_builder.h"
 
-#include "core/hash/sha256.h"
+#include "crypto/hash/sha256.h"
 
 void UserController::handle_request_main(Request *request) {
 	if (request->session.is_valid()) {