Moved common files to less dumb locations

2024-06-09 09:20:44 +00:00 · 2019-02-28 17:40:12 -05:00 · 2019-02-28 17:40:12 -05:00 · ba96135e01
commit ba96135e01
parent cf05db6759
62 changed files with 9 additions and 12 deletions
--- a/src/ExtraUtils/CLI11/CLI11.hpp
+++ b/src/ExtraUtils/CLI11/CLI11.hpp
--- a/src/ExtraUtils/spdlog/async.h
+++ b/src/ExtraUtils/spdlog/async.h
--- a/src/ExtraUtils/spdlog/async_logger.h
+++ b/src/ExtraUtils/spdlog/async_logger.h
--- a/src/ExtraUtils/spdlog/common.h
+++ b/src/ExtraUtils/spdlog/common.h
--- a/src/ExtraUtils/spdlog/details/async_logger_impl.h
+++ b/src/ExtraUtils/spdlog/details/async_logger_impl.h
--- a/src/ExtraUtils/spdlog/details/circular_q.h
+++ b/src/ExtraUtils/spdlog/details/circular_q.h
--- a/src/ExtraUtils/spdlog/details/console_globals.h
+++ b/src/ExtraUtils/spdlog/details/console_globals.h
--- a/src/ExtraUtils/spdlog/details/file_helper.h
+++ b/src/ExtraUtils/spdlog/details/file_helper.h
--- a/src/ExtraUtils/spdlog/details/fmt_helper.h
+++ b/src/ExtraUtils/spdlog/details/fmt_helper.h
--- a/src/ExtraUtils/spdlog/details/log_msg.h
+++ b/src/ExtraUtils/spdlog/details/log_msg.h
--- a/src/ExtraUtils/spdlog/details/logger_impl.h
+++ b/src/ExtraUtils/spdlog/details/logger_impl.h
--- a/src/ExtraUtils/spdlog/details/mpmc_blocking_q.h
+++ b/src/ExtraUtils/spdlog/details/mpmc_blocking_q.h
--- a/src/ExtraUtils/spdlog/details/null_mutex.h
+++ b/src/ExtraUtils/spdlog/details/null_mutex.h
--- a/src/ExtraUtils/spdlog/details/os.h
+++ b/src/ExtraUtils/spdlog/details/os.h
--- a/src/ExtraUtils/spdlog/details/pattern_formatter.h
+++ b/src/ExtraUtils/spdlog/details/pattern_formatter.h
--- a/src/ExtraUtils/spdlog/details/periodic_worker.h
+++ b/src/ExtraUtils/spdlog/details/periodic_worker.h
--- a/src/ExtraUtils/spdlog/details/registry.h
+++ b/src/ExtraUtils/spdlog/details/registry.h
--- a/src/ExtraUtils/spdlog/details/thread_pool.h
+++ b/src/ExtraUtils/spdlog/details/thread_pool.h
--- a/src/ExtraUtils/spdlog/fmt/bin_to_hex.h
+++ b/src/ExtraUtils/spdlog/fmt/bin_to_hex.h
--- a/src/ExtraUtils/spdlog/fmt/bundled/LICENSE.rst
+++ b/src/ExtraUtils/spdlog/fmt/bundled/LICENSE.rst
--- a/src/ExtraUtils/spdlog/fmt/bundled/chrono.h
+++ b/src/ExtraUtils/spdlog/fmt/bundled/chrono.h
--- a/src/ExtraUtils/spdlog/fmt/bundled/color.h
+++ b/src/ExtraUtils/spdlog/fmt/bundled/color.h
--- a/src/ExtraUtils/spdlog/fmt/bundled/core.h
+++ b/src/ExtraUtils/spdlog/fmt/bundled/core.h
--- a/src/ExtraUtils/spdlog/fmt/bundled/format-inl.h
+++ b/src/ExtraUtils/spdlog/fmt/bundled/format-inl.h
--- a/src/ExtraUtils/spdlog/fmt/bundled/format.h
+++ b/src/ExtraUtils/spdlog/fmt/bundled/format.h
--- a/src/ExtraUtils/spdlog/fmt/bundled/locale.h
+++ b/src/ExtraUtils/spdlog/fmt/bundled/locale.h
--- a/src/ExtraUtils/spdlog/fmt/bundled/ostream.h
+++ b/src/ExtraUtils/spdlog/fmt/bundled/ostream.h
--- a/src/ExtraUtils/spdlog/fmt/bundled/posix.h
+++ b/src/ExtraUtils/spdlog/fmt/bundled/posix.h
--- a/src/ExtraUtils/spdlog/fmt/bundled/printf.h
+++ b/src/ExtraUtils/spdlog/fmt/bundled/printf.h
--- a/src/ExtraUtils/spdlog/fmt/bundled/ranges.h
+++ b/src/ExtraUtils/spdlog/fmt/bundled/ranges.h
--- a/src/ExtraUtils/spdlog/fmt/bundled/time.h
+++ b/src/ExtraUtils/spdlog/fmt/bundled/time.h
--- a/src/ExtraUtils/spdlog/fmt/fmt.h
+++ b/src/ExtraUtils/spdlog/fmt/fmt.h
--- a/src/ExtraUtils/spdlog/fmt/ostr.h
+++ b/src/ExtraUtils/spdlog/fmt/ostr.h
--- a/src/ExtraUtils/spdlog/formatter.h
+++ b/src/ExtraUtils/spdlog/formatter.h
--- a/src/ExtraUtils/spdlog/logger.h
+++ b/src/ExtraUtils/spdlog/logger.h
--- a/src/ExtraUtils/spdlog/sinks/android_sink.h
+++ b/src/ExtraUtils/spdlog/sinks/android_sink.h
--- a/src/ExtraUtils/spdlog/sinks/ansicolor_sink.h
+++ b/src/ExtraUtils/spdlog/sinks/ansicolor_sink.h
--- a/src/ExtraUtils/spdlog/sinks/base_sink.h
+++ b/src/ExtraUtils/spdlog/sinks/base_sink.h
--- a/src/ExtraUtils/spdlog/sinks/basic_file_sink.h
+++ b/src/ExtraUtils/spdlog/sinks/basic_file_sink.h
--- a/src/ExtraUtils/spdlog/sinks/daily_file_sink.h
+++ b/src/ExtraUtils/spdlog/sinks/daily_file_sink.h
--- a/src/ExtraUtils/spdlog/sinks/dist_sink.h
+++ b/src/ExtraUtils/spdlog/sinks/dist_sink.h
--- a/src/ExtraUtils/spdlog/sinks/msvc_sink.h
+++ b/src/ExtraUtils/spdlog/sinks/msvc_sink.h
--- a/src/ExtraUtils/spdlog/sinks/null_sink.h
+++ b/src/ExtraUtils/spdlog/sinks/null_sink.h
--- a/src/ExtraUtils/spdlog/sinks/ostream_sink.h
+++ b/src/ExtraUtils/spdlog/sinks/ostream_sink.h
--- a/src/ExtraUtils/spdlog/sinks/rotating_file_sink.h
+++ b/src/ExtraUtils/spdlog/sinks/rotating_file_sink.h
--- a/src/ExtraUtils/spdlog/sinks/sink.h
+++ b/src/ExtraUtils/spdlog/sinks/sink.h
--- a/src/ExtraUtils/spdlog/sinks/stdout_color_sinks.h
+++ b/src/ExtraUtils/spdlog/sinks/stdout_color_sinks.h
--- a/src/ExtraUtils/spdlog/sinks/stdout_sinks.h
+++ b/src/ExtraUtils/spdlog/sinks/stdout_sinks.h
--- a/src/ExtraUtils/spdlog/sinks/syslog_sink.h
+++ b/src/ExtraUtils/spdlog/sinks/syslog_sink.h
--- a/src/ExtraUtils/spdlog/sinks/wincolor_sink.h
+++ b/src/ExtraUtils/spdlog/sinks/wincolor_sink.h
--- a/src/ExtraUtils/spdlog/spdlog.h
+++ b/src/ExtraUtils/spdlog/spdlog.h
--- a/src/ExtraUtils/spdlog/tweakme.h
+++ b/src/ExtraUtils/spdlog/tweakme.h
--- a/src/ExtraUtils/spdlog/version.h
+++ b/src/ExtraUtils/spdlog/version.h
--- a/src/OpenDiablo2.Game/include/OpenDiablo2.Game/Common/D2Palette.h
+++ b/src/OpenDiablo2.Game/include/OpenDiablo2.Game/Common/D2Palette.h
--- a/src/OpenDiablo2.Game/include/OpenDiablo2.Game/Common/D2Point.h
+++ b/src/OpenDiablo2.Game/include/OpenDiablo2.Game/Common/D2Point.h
--- a/src/OpenDiablo2.Game/include/OpenDiablo2.Game/Common/D2ResourcePath.h
+++ b/src/OpenDiablo2.Game/include/OpenDiablo2.Game/Common/D2ResourcePath.h
--- a/src/OpenDiablo2.Game/include/OpenDiablo2.Game/Common/D2Size.h
+++ b/src/OpenDiablo2.Game/include/OpenDiablo2.Game/Common/D2Size.h
--- a/src/OpenDiablo2.Game/CMakeLists.txt
+++ b/src/OpenDiablo2.Game/CMakeLists.txt
@ -9,10 +9,6 @@ set (HEADERS
 	include/OpenDiablo2.Game/D2DataManager.h
 	include/OpenDiablo2.Game/D2Engine.h
 	include/OpenDiablo2.Game/D2EngineConfig.h
-	include/OpenDiablo2.Game/Common/D2Palette.h
-	include/OpenDiablo2.Game/Common/D2Point.h
-	include/OpenDiablo2.Game/Common/D2ResourcePath.h
-	include/OpenDiablo2.Game/Common/D2Size.h
 	include/OpenDiablo2.Game/Scenes/D2Scene.h
 	include/OpenDiablo2.Game/Scenes/D2MainMenu.h
 )
@ -21,8 +17,9 @@ add_executable(OpenDiablo2.Game ${SOURCES} ${HEADERS})

 include_directories(OpenDiablo2.Game
 	PUBLIC
-		../Common
+		../ExtraUtils
 		../OpenDiablo2.SDL2/include
+		../OpenDiablo2.Common/include
 		include
 )

--- a/src/OpenDiablo2.Game/src/Scenes/D2MainMenu.cpp
+++ b/src/OpenDiablo2.Game/src/Scenes/D2MainMenu.cpp
@ -1,5 +1,5 @@
 #include <OpenDiablo2.Game/Scenes/D2MainMenu.h>
-#include <OpenDiablo2.Game/Common/D2ResourcePath.h>
+#include <OpenDiablo2.Common/D2ResourcePath.h>

 OpenDiablo2::Game::Scenes::MainMenu::MainMenu(std::shared_ptr<D2Engine> engine)
 : engine(engine) {
--- a/src/OpenDiablo2.SDL2/CMakeLists.txt
+++ b/src/OpenDiablo2.SDL2/CMakeLists.txt
@ -19,8 +19,8 @@ target_include_directories(OpenDiablo2.SDL2
 	PUBLIC
 		include
 	PRIVATE
-		../Common
-		../OpenDiablo2.Game/include
+		../ExtraUtils
+		../OpenDiablo2.Common/include
 		include
 		sdl2::sdl2
 		SDL2::SDL2main
--- a/src/OpenDiablo2.SDL2/include/OpenDiablo2.System/D2Sprite.h
+++ b/src/OpenDiablo2.SDL2/include/OpenDiablo2.System/D2Sprite.h
@ -1,9 +1,9 @@
 #ifndef OPENDIABLO2_SYSTEM_D2SPRITE_H
 #define OPENDIABLO2_SYSTEM_D2SPRITE_H

-#include <OpenDiablo2.Game/Common/D2Palette.h>
-#include <OpenDiablo2.Game/Common/D2Point.h>
-#include <OpenDiablo2.Game/Common/D2Size.h>
+#include <OpenDiablo2.Common/D2Palette.h>
+#include <OpenDiablo2.Common/D2Point.h>
+#include <OpenDiablo2.Common/D2Size.h>

 namespace OpenDiablo2::System {

--- a/src/OpenDiablo2.SDL2/src/D2Sprite.cpp
+++ b/src/OpenDiablo2.SDL2/src/D2Sprite.cpp
@ -1,5 +1,5 @@
 #include <OpenDiablo2.System/D2Sprite.h>
-#include <OpenDiablo2.Game/Common/D2Palette.h>
+#include <OpenDiablo2.Common/D2Palette.h>

 OpenDiablo2::System::D2Sprite::D2Sprite()
 {