Create source file list from globbing .hpp / .cpp files.

Move util/3rdpart things to /lib Add /include folder. Add both to include directories. synchronize.py is hacky and ugly, but it works.
Cthuulu · May 4, 2020 · dd5abd8 · dd5abd8
1 parent 2d8871b
commit dd5abd8
Show file tree

Hide file tree

Showing 110 changed files with 3,921 additions and 3,878 deletions.
diff --git a/engine/CMakeLists.txt b/engine/CMakeLists.txt
@@ -7,7 +7,7 @@ include(../source_files/cmake_engine.txt)
 
 # Define engine library
 add_library(engine ${source_files})
-target_include_directories(engine PUBLIC . ./util)
+target_include_directories(engine PUBLIC . ./include ./lib)
 
 # Make cmake selections visible to C++ code
 if(SC_NO_THREADING)

diff --git a/engine/Makefile b/engine/Makefile
@@ -55,7 +55,7 @@ endif
 
 MKDIR      = mkdir
 CXX        = c++
-CPP_FLAGS  = -Wall -Wextra -W -I. -I./util -DSC_SHARED_DATA=\"$(SHARED_DATA)\" --std=c++14 -O3 -MMD -MP \
+CPP_FLAGS  = -Wall -Wextra -W -I. -I./include -I./lib -DSC_SHARED_DATA=\"$(SHARED_DATA)\" --std=c++14 -O3 -MMD -MP \
 -Wpedantic \
 -Wcast-qual \
 -Wconversion-null

diff --git a/engine/action/sc_action.hpp b/engine/action/sc_action.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "config.hpp"
-#include "generic.hpp"
+#include "util/generic.hpp"
 #include "sc_enums.hpp"
 #include "sc_timespan.hpp"
 #include "player/target_specific.hpp"

diff --git a/engine/action/sc_action_state.hpp b/engine/action/sc_action_state.hpp
@@ -9,7 +9,7 @@
 #include <string>
 #include <iostream>
 #include "config.hpp"
-#include "generic.hpp"
+#include "util/generic.hpp"
 #include "sc_enums.hpp"
 #include "dbc/data_enums.hh"
 

diff --git a/engine/buff/sc_buff.cpp b/engine/buff/sc_buff.cpp
@@ -10,7 +10,7 @@
 #include "sim/event.hpp"
 #include "sim/sc_sim.hpp"
 #include "sim/real_ppm.hpp"
-#include "rng.hpp"
+#include "util/rng.hpp"
 #include "sim/sc_cooldown.hpp"
 #include "sim/sc_expressions.hpp"
 #include "dbc/item_database.hpp"

diff --git a/engine/dbc/item_armor.hpp b/engine/dbc/item_armor.hpp
@@ -5,7 +5,7 @@
 #ifndef ITEM_ARMOR_HPP
 #define ITEM_ARMOR_HPP
 
-#include "generic.hpp"
+#include "util/generic.hpp"
 #include "util/array_view.hpp"
 
 #include "client_data.hpp"

diff --git a/engine/dbc/item_weapon.hpp b/engine/dbc/item_weapon.hpp
@@ -5,7 +5,7 @@
 #ifndef ITEM_WEAPON_HPP
 #define ITEM_WEAPON_HPP
 
-#include "generic.hpp"
+#include "util/generic.hpp"
 #include "util/array_view.hpp"
 
 #include "client_data.hpp"

diff --git a/engine/interfaces/sc_bcp_api.cpp b/engine/interfaces/sc_bcp_api.cpp
@@ -5,11 +5,11 @@
 
 #include "simulationcraft.hpp"
 
-#include "util/rapidjson/document.h"
-#include "util/rapidjson/stringbuffer.h"
-#include "util/rapidjson/prettywriter.h"
+#include "rapidjson/document.h"
+#include "rapidjson/stringbuffer.h"
+#include "rapidjson/prettywriter.h"
 
-#include "../util/utf8-h/utf8.h"
+#include "utf8-h/utf8.h"
 
 // ==========================================================================
 // Blizzard Community Platform API

diff --git a/engine/interfaces/sc_js.hpp b/engine/interfaces/sc_js.hpp
@@ -9,9 +9,9 @@
 #define RAPIDJSON_HAS_STDSTRING 1
 #endif
 
-#include "util/rapidjson/document.h"
-#include "util/rapidjson/stringbuffer.h"
-#include "util/rapidjson/prettywriter.h"
+#include "rapidjson/document.h"
+#include "rapidjson/stringbuffer.h"
+#include "rapidjson/prettywriter.h"
 #include <utility>
 #include <string>
 #include <vector>

diff --git a/engine/interfaces/wowhead.cpp b/engine/interfaces/wowhead.cpp
@@ -6,9 +6,10 @@
 #include "wowhead.hpp"
 #include "simulationcraft.hpp"
 
-#include "util/rapidjson/document.h"
-#include "util/rapidjson/stringbuffer.h"
-#include "util/rapidjson/prettywriter.h"
+#include "rapidjson/document.h"
+#include "rapidjson/stringbuffer.h"
+#include "rapidjson/prettywriter.h"
+#include "rapidjson/prettywriter.h"
 
 namespace {
 // source_str ===============================================================

diff --git a/engine/item/item.hpp b/engine/item/item.hpp
@@ -6,7 +6,7 @@
 #pragma once
 
 #include "config.hpp"
-#include "generic.hpp"
+#include "util/generic.hpp"
 #include "sc_enums.hpp"
 #include "player/gear_stats.hpp"
 #include "sc_timespan.hpp"

diff --git a/engine/util/fmt/README.md → engine/lib/fmt/README.md b/engine/util/fmt/README.md → engine/lib/fmt/README.md
diff --git a/engine/util/fmt/chrono.h → engine/lib/fmt/chrono.h b/engine/util/fmt/chrono.h → engine/lib/fmt/chrono.h
diff --git a/engine/util/fmt/color.h → engine/lib/fmt/color.h b/engine/util/fmt/color.h → engine/lib/fmt/color.h
diff --git a/engine/util/fmt/compile.h → engine/lib/fmt/compile.h b/engine/util/fmt/compile.h → engine/lib/fmt/compile.h
diff --git a/engine/util/fmt/core.h → engine/lib/fmt/core.h b/engine/util/fmt/core.h → engine/lib/fmt/core.h
diff --git a/engine/util/fmt/format-inl.h → engine/lib/fmt/format-inl.h b/engine/util/fmt/format-inl.h → engine/lib/fmt/format-inl.h
diff --git a/engine/util/fmt/format.cpp → engine/lib/fmt/format.cpp b/engine/util/fmt/format.cpp → engine/lib/fmt/format.cpp
diff --git a/engine/util/fmt/format.h → engine/lib/fmt/format.h b/engine/util/fmt/format.h → engine/lib/fmt/format.h
diff --git a/engine/util/fmt/locale.h → engine/lib/fmt/locale.h b/engine/util/fmt/locale.h → engine/lib/fmt/locale.h
diff --git a/engine/util/fmt/os.cpp → engine/lib/fmt/os.cpp b/engine/util/fmt/os.cpp → engine/lib/fmt/os.cpp
diff --git a/engine/util/fmt/os.h → engine/lib/fmt/os.h b/engine/util/fmt/os.h → engine/lib/fmt/os.h
diff --git a/engine/util/fmt/ostream.h → engine/lib/fmt/ostream.h b/engine/util/fmt/ostream.h → engine/lib/fmt/ostream.h
diff --git a/engine/util/fmt/posix.h → engine/lib/fmt/posix.h b/engine/util/fmt/posix.h → engine/lib/fmt/posix.h
diff --git a/engine/util/fmt/printf.h → engine/lib/fmt/printf.h b/engine/util/fmt/printf.h → engine/lib/fmt/printf.h
diff --git a/engine/util/fmt/ranges.h → engine/lib/fmt/ranges.h b/engine/util/fmt/ranges.h → engine/lib/fmt/ranges.h
diff --git a/engine/util/gsl-lite/README.md → engine/lib/gsl-lite/README.md b/engine/util/gsl-lite/README.md → engine/lib/gsl-lite/README.md
diff --git a/engine/util/gsl-lite/gsl-lite.hpp → engine/lib/gsl-lite/gsl-lite.hpp b/engine/util/gsl-lite/gsl-lite.hpp → engine/lib/gsl-lite/gsl-lite.hpp
diff --git a/engine/util/rapidjson/allocators.h → engine/lib/rapidjson/allocators.h b/engine/util/rapidjson/allocators.h → engine/lib/rapidjson/allocators.h
diff --git a/engine/util/rapidjson/document.h → engine/lib/rapidjson/document.h b/engine/util/rapidjson/document.h → engine/lib/rapidjson/document.h
diff --git a/engine/util/rapidjson/encodedstream.h → engine/lib/rapidjson/encodedstream.h b/engine/util/rapidjson/encodedstream.h → engine/lib/rapidjson/encodedstream.h
diff --git a/engine/util/rapidjson/encodings.h → engine/lib/rapidjson/encodings.h b/engine/util/rapidjson/encodings.h → engine/lib/rapidjson/encodings.h
diff --git a/engine/util/rapidjson/error/en.h → engine/lib/rapidjson/error/en.h b/engine/util/rapidjson/error/en.h → engine/lib/rapidjson/error/en.h
diff --git a/engine/util/rapidjson/error/error.h → engine/lib/rapidjson/error/error.h b/engine/util/rapidjson/error/error.h → engine/lib/rapidjson/error/error.h
diff --git a/engine/util/rapidjson/filereadstream.h → engine/lib/rapidjson/filereadstream.h b/engine/util/rapidjson/filereadstream.h → engine/lib/rapidjson/filereadstream.h
diff --git a/engine/util/rapidjson/filestream.h → engine/lib/rapidjson/filestream.h b/engine/util/rapidjson/filestream.h → engine/lib/rapidjson/filestream.h
diff --git a/engine/util/rapidjson/filewritestream.h → engine/lib/rapidjson/filewritestream.h b/engine/util/rapidjson/filewritestream.h → engine/lib/rapidjson/filewritestream.h
diff --git a/engine/util/rapidjson/fwd.h → engine/lib/rapidjson/fwd.h b/engine/util/rapidjson/fwd.h → engine/lib/rapidjson/fwd.h
diff --git a/engine/util/rapidjson/internal/biginteger.h → engine/lib/rapidjson/internal/biginteger.h b/engine/util/rapidjson/internal/biginteger.h → engine/lib/rapidjson/internal/biginteger.h
diff --git a/engine/util/rapidjson/internal/diyfp.h → engine/lib/rapidjson/internal/diyfp.h b/engine/util/rapidjson/internal/diyfp.h → engine/lib/rapidjson/internal/diyfp.h
diff --git a/engine/util/rapidjson/internal/dtoa.h → engine/lib/rapidjson/internal/dtoa.h b/engine/util/rapidjson/internal/dtoa.h → engine/lib/rapidjson/internal/dtoa.h
diff --git a/engine/util/rapidjson/internal/ieee754.h → engine/lib/rapidjson/internal/ieee754.h b/engine/util/rapidjson/internal/ieee754.h → engine/lib/rapidjson/internal/ieee754.h
diff --git a/engine/util/rapidjson/internal/itoa.h → engine/lib/rapidjson/internal/itoa.h b/engine/util/rapidjson/internal/itoa.h → engine/lib/rapidjson/internal/itoa.h
diff --git a/engine/util/rapidjson/internal/meta.h → engine/lib/rapidjson/internal/meta.h b/engine/util/rapidjson/internal/meta.h → engine/lib/rapidjson/internal/meta.h
diff --git a/engine/util/rapidjson/internal/pow10.h → engine/lib/rapidjson/internal/pow10.h b/engine/util/rapidjson/internal/pow10.h → engine/lib/rapidjson/internal/pow10.h
diff --git a/engine/util/rapidjson/internal/regex.h → engine/lib/rapidjson/internal/regex.h b/engine/util/rapidjson/internal/regex.h → engine/lib/rapidjson/internal/regex.h
diff --git a/engine/util/rapidjson/internal/stack.h → engine/lib/rapidjson/internal/stack.h b/engine/util/rapidjson/internal/stack.h → engine/lib/rapidjson/internal/stack.h
diff --git a/engine/util/rapidjson/internal/strfunc.h → engine/lib/rapidjson/internal/strfunc.h b/engine/util/rapidjson/internal/strfunc.h → engine/lib/rapidjson/internal/strfunc.h
diff --git a/engine/util/rapidjson/internal/strtod.h → engine/lib/rapidjson/internal/strtod.h b/engine/util/rapidjson/internal/strtod.h → engine/lib/rapidjson/internal/strtod.h
diff --git a/engine/util/rapidjson/internal/swap.h → engine/lib/rapidjson/internal/swap.h b/engine/util/rapidjson/internal/swap.h → engine/lib/rapidjson/internal/swap.h
diff --git a/engine/util/rapidjson/istreamwrapper.h → engine/lib/rapidjson/istreamwrapper.h b/engine/util/rapidjson/istreamwrapper.h → engine/lib/rapidjson/istreamwrapper.h
diff --git a/engine/util/rapidjson/memorybuffer.h → engine/lib/rapidjson/memorybuffer.h b/engine/util/rapidjson/memorybuffer.h → engine/lib/rapidjson/memorybuffer.h
diff --git a/engine/util/rapidjson/memorystream.h → engine/lib/rapidjson/memorystream.h b/engine/util/rapidjson/memorystream.h → engine/lib/rapidjson/memorystream.h
diff --git a/engine/util/rapidjson/ostreamwrapper.h → engine/lib/rapidjson/ostreamwrapper.h b/engine/util/rapidjson/ostreamwrapper.h → engine/lib/rapidjson/ostreamwrapper.h
diff --git a/engine/util/rapidjson/pointer.h → engine/lib/rapidjson/pointer.h b/engine/util/rapidjson/pointer.h → engine/lib/rapidjson/pointer.h
diff --git a/engine/util/rapidjson/prettywriter.h → engine/lib/rapidjson/prettywriter.h b/engine/util/rapidjson/prettywriter.h → engine/lib/rapidjson/prettywriter.h
diff --git a/engine/util/rapidjson/rapidjson.h → engine/lib/rapidjson/rapidjson.h b/engine/util/rapidjson/rapidjson.h → engine/lib/rapidjson/rapidjson.h
diff --git a/engine/util/rapidjson/reader.h → engine/lib/rapidjson/reader.h b/engine/util/rapidjson/reader.h → engine/lib/rapidjson/reader.h
diff --git a/engine/util/rapidjson/schema.h → engine/lib/rapidjson/schema.h b/engine/util/rapidjson/schema.h → engine/lib/rapidjson/schema.h
diff --git a/engine/util/rapidjson/stream.h → engine/lib/rapidjson/stream.h b/engine/util/rapidjson/stream.h → engine/lib/rapidjson/stream.h
diff --git a/engine/util/rapidjson/stringbuffer.h → engine/lib/rapidjson/stringbuffer.h b/engine/util/rapidjson/stringbuffer.h → engine/lib/rapidjson/stringbuffer.h
diff --git a/engine/util/rapidjson/writer.h → engine/lib/rapidjson/writer.h b/engine/util/rapidjson/writer.h → engine/lib/rapidjson/writer.h