Update to new 'magic_enum' folder structure

richelbilderbeek · richelbilderbeek · commit 0e7e76205309 · 2023-11-21T18:51:10.000+01:00
diff --git a/chess_color.cpp b/chess_color.cpp
@@ -4,8 +4,7 @@
 #include <iostream>
 #include <sstream>
 
-
-#include "../magic_enum/include/magic_enum.hpp" // https://github.com/Neargye/magic_enum
+#include "../magic_enum/include/magic_enum/magic_enum.hpp" // https://github.com/Neargye/magic_enum
 
 std::vector<chess_color> get_all_chess_colors() noexcept
 {
diff --git a/controls_view_item.cpp b/controls_view_item.cpp
@@ -3,7 +3,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../magic_enum/include/magic_enum.hpp"
+#include <magic_enum/magic_enum.hpp> // https://github.com/Neargye/magic_enum
 
 std::vector<controls_view_item> get_all_controls_view_items() noexcept
 {
diff --git a/game.pro b/game.pro
@@ -44,5 +44,10 @@ QT += core gui widgets
 
 LIBS += -lsfml-graphics -lsfml-window -lsfml-system -lsfml-audio
 
-#INCLUDEPATH += ../magic_enum
-
+# magic_enum, from https://github.com/Neargye/magic_enum
+#
+# Must allow for:
+#
+#   include <magic_enum/magic_enum.hpp>
+#
+INCLUDEPATH += ../magic_enum/include
diff --git a/game_speed.cpp b/game_speed.cpp
@@ -5,7 +5,7 @@
 #include <iostream>
 #include <sstream>
 
-#include "../magic_enum/include/magic_enum.hpp" // https://github.com/Neargye/magic_enum
+#include <magic_enum/magic_enum.hpp> // https://github.com/Neargye/magic_enum
 
 std::vector<game_speed> get_all_game_speeds() noexcept
 {
diff --git a/lobby_view_item.cpp b/lobby_view_item.cpp
@@ -3,7 +3,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../magic_enum/include/magic_enum.hpp"
+#include <magic_enum/magic_enum.hpp> // https://github.com/Neargye/magic_enum
 
 std::vector<lobby_view_item> get_all_lobby_view_items() noexcept
 {
diff --git a/menu_view_item.cpp b/menu_view_item.cpp
@@ -3,7 +3,7 @@
 #include <algorithm>
 #include <cassert>
 
-#include "../magic_enum/include/magic_enum.hpp"
+#include <magic_enum/magic_enum.hpp> // https://github.com/Neargye/magic_enum
 
 std::vector<menu_view_item> get_all_menu_view_items() noexcept
 {
diff --git a/message_type.cpp b/message_type.cpp
@@ -1,6 +1,6 @@
 #include "message_type.h"
 
-#include "../magic_enum/include/magic_enum.hpp"
+#include <magic_enum/magic_enum.hpp> // https://github.com/Neargye/magic_enum
 
 #include <cassert>
 #include <iostream>
diff --git a/options_view_item.cpp b/options_view_item.cpp
@@ -1,6 +1,6 @@
 #include "options_view_item.h"
 
-#include "../magic_enum/include/magic_enum.hpp"
+#include <magic_enum/magic_enum.hpp> // https://github.com/Neargye/magic_enum
 
 #include <algorithm>
 #include <cassert>
diff --git a/piece_action_type.cpp b/piece_action_type.cpp
@@ -4,7 +4,7 @@
 #include <iostream>
 #include <sstream>
 
-#include "../magic_enum/include/magic_enum.hpp"
+#include <magic_enum/magic_enum.hpp> // https://github.com/Neargye/magic_enum
 
 std::vector<piece_action_type> get_all_piece_action_types() noexcept
 {
diff --git a/race.cpp b/race.cpp
@@ -5,7 +5,7 @@
 #include <iostream>
 #include <sstream>
 
-#include "../magic_enum/include/magic_enum.hpp" // https://github.com/Neargye/magic_enum
+#include <magic_enum/magic_enum.hpp> // https://github.com/Neargye/magic_enum
 
 std::vector<race> get_all_races() noexcept
 {
diff --git a/starting_position_type.cpp b/starting_position_type.cpp
@@ -5,7 +5,7 @@
 #include <iostream>
 #include <sstream>
 
-#include "../magic_enum/include/magic_enum.hpp"
+#include <magic_enum/magic_enum.hpp> // https://github.com/Neargye/magic_enum
 
 std::vector<starting_position_type> get_all_starting_position_types() noexcept
 {
diff --git a/user_input_type.cpp b/user_input_type.cpp
@@ -1,6 +1,6 @@
 #include "user_input_type.h"
 
-#include "../magic_enum/include/magic_enum.hpp"
+#include <magic_enum/magic_enum.hpp> // https://github.com/Neargye/magic_enum
 
 user_input_type create_random_user_input_type(
   std::default_random_engine& rng_engine

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,7 @@`
`4`	`4`	`#include <iostream>`
`5`	`5`	`#include <sstream>`
`6`	`6`
`7`		`-`
`8`		`-#include "../magic_enum/include/magic_enum.hpp" // https://github.com/Neargye/magic_enum`
	`7`	`+#include "../magic_enum/include/magic_enum/magic_enum.hpp" // https://github.com/Neargye/magic_enum`
`9`	`8`
`10`	`9`	`std::vector<chess_color> get_all_chess_colors() noexcept`
`11`	`10`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@`
`3`	`3`	`#include <algorithm>`
`4`	`4`	`#include <cassert>`
`5`	`5`
`6`		`-#include "../magic_enum/include/magic_enum.hpp"`
	`6`	`+#include <magic_enum/magic_enum.hpp> // https://github.com/Neargye/magic_enum`
`7`	`7`
`8`	`8`	`std::vector<controls_view_item> get_all_controls_view_items() noexcept`
`9`	`9`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`#include <iostream>`
`6`	`6`	`#include <sstream>`
`7`	`7`
`8`		`-#include "../magic_enum/include/magic_enum.hpp" // https://github.com/Neargye/magic_enum`
	`8`	`+#include <magic_enum/magic_enum.hpp> // https://github.com/Neargye/magic_enum`
`9`	`9`
`10`	`10`	`std::vector<game_speed> get_all_game_speeds() noexcept`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`#include <iostream>`
`5`	`5`	`#include <sstream>`
`6`	`6`
`7`		`-#include "../magic_enum/include/magic_enum.hpp"`
	`7`	`+#include <magic_enum/magic_enum.hpp> // https://github.com/Neargye/magic_enum`
`8`	`8`
`9`	`9`	`std::vector<piece_action_type> get_all_piece_action_types() noexcept`
`10`	`10`	`{`