From 97d515005b5b6adf95ce619018dbb15a00aca0aa Mon Sep 17 00:00:00 2001
From: Christoph Oelckers <coelckers@users.noreply.github.com>
Date: Sun, 14 Jun 2020 18:04:47 +0200
Subject: [PATCH] - moved the menu code back to the game side.

This isn't really shareable. Although major parts may be identical, the specifics are not.
---
 src/CMakeLists.txt                       | 12 ++++++------
 src/{common => }/menu/joystickmenu.cpp   |  0
 src/{common => }/menu/menu.cpp           |  0
 src/{common => }/menu/menu.h             |  0
 src/{common => }/menu/menudef.cpp        |  0
 src/{common => }/menu/messagebox.cpp     |  0
 src/{common => }/menu/optionmenu.cpp     |  0
 src/{common => }/menu/resolutionmenu.cpp |  0
 8 files changed, 6 insertions(+), 6 deletions(-)
 rename src/{common => }/menu/joystickmenu.cpp (100%)
 rename src/{common => }/menu/menu.cpp (100%)
 rename src/{common => }/menu/menu.h (100%)
 rename src/{common => }/menu/menudef.cpp (100%)
 rename src/{common => }/menu/messagebox.cpp (100%)
 rename src/{common => }/menu/optionmenu.cpp (100%)
 rename src/{common => }/menu/resolutionmenu.cpp (100%)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index b32fc1e6f6..26c617e919 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -953,9 +953,15 @@ set (PCH_SOURCES
 	maploader/renderinfo.cpp
 	maploader/compatibility.cpp
 	maploader/postprocessor.cpp
+	menu/joystickmenu.cpp
+	menu/menu.cpp
+	menu/messagebox.cpp
+	menu/optionmenu.cpp
+	menu/resolutionmenu.cpp
 	menu/doommenu.cpp
 	menu/loadsavemenu.cpp
 	menu/playermenu.cpp
+	menu/menudef.cpp
 	gamedata/textures/animations.cpp
 	gamedata/textures/anim_switches.cpp
 	gamedata/textures/buildloader.cpp
@@ -1114,12 +1120,6 @@ set (PCH_SOURCES
 	common/objects/dobject.cpp
 	common/objects/dobjgc.cpp
 	common/objects/dobjtype.cpp
-	common/menu/joystickmenu.cpp
-	common/menu/menu.cpp
-	common/menu/messagebox.cpp
-	common/menu/optionmenu.cpp
-	common/menu/resolutionmenu.cpp
-	common/menu/menudef.cpp
 	
 	common/rendering/v_framebuffer.cpp
 	common/rendering/v_video.cpp
diff --git a/src/common/menu/joystickmenu.cpp b/src/menu/joystickmenu.cpp
similarity index 100%
rename from src/common/menu/joystickmenu.cpp
rename to src/menu/joystickmenu.cpp
diff --git a/src/common/menu/menu.cpp b/src/menu/menu.cpp
similarity index 100%
rename from src/common/menu/menu.cpp
rename to src/menu/menu.cpp
diff --git a/src/common/menu/menu.h b/src/menu/menu.h
similarity index 100%
rename from src/common/menu/menu.h
rename to src/menu/menu.h
diff --git a/src/common/menu/menudef.cpp b/src/menu/menudef.cpp
similarity index 100%
rename from src/common/menu/menudef.cpp
rename to src/menu/menudef.cpp
diff --git a/src/common/menu/messagebox.cpp b/src/menu/messagebox.cpp
similarity index 100%
rename from src/common/menu/messagebox.cpp
rename to src/menu/messagebox.cpp
diff --git a/src/common/menu/optionmenu.cpp b/src/menu/optionmenu.cpp
similarity index 100%
rename from src/common/menu/optionmenu.cpp
rename to src/menu/optionmenu.cpp
diff --git a/src/common/menu/resolutionmenu.cpp b/src/menu/resolutionmenu.cpp
similarity index 100%
rename from src/common/menu/resolutionmenu.cpp
rename to src/menu/resolutionmenu.cpp