From 67cafb35d421f7c8ba7ce3ed0aee639731f43bf9 Mon Sep 17 00:00:00 2001
From: DeaDDooMER <deaddoomer@deadsoftware.ru>
Date: Wed, 7 Apr 2021 10:58:57 +0300
Subject: [PATCH] cp866: move to common/

---
 src/{libs/cp866 => common}/cp866.c | 0
 src/{libs/cp866 => common}/cp866.h | 0
 src/config.c                       | 3 ++-
 src/files.c                        | 2 +-
 src/gl/render.c                    | 2 +-
 src/input.c                        | 3 ++-
 src/map.c                          | 2 +-
 src/sdl2/main.c                    | 4 ++--
 src/soft/render.c                  | 2 +-
 9 files changed, 10 insertions(+), 8 deletions(-)
 rename src/{libs/cp866 => common}/cp866.c (100%)
 rename src/{libs/cp866 => common}/cp866.h (100%)

diff --git a/src/libs/cp866/cp866.c b/src/common/cp866.c
similarity index 100%
rename from src/libs/cp866/cp866.c
rename to src/common/cp866.c
diff --git a/src/libs/cp866/cp866.h b/src/common/cp866.h
similarity index 100%
rename from src/libs/cp866/cp866.h
rename to src/common/cp866.h
diff --git a/src/config.c b/src/config.c
index 6ebb425..86b6d22 100644
--- a/src/config.c
+++ b/src/config.c
@@ -22,7 +22,8 @@
 #include "system.h"
 #include "files.h"
 #include "input.h"
-#include "cp866.h"
+
+#include "common/cp866.h"
 
 static FILE *f;
 static int ch;
diff --git a/src/files.c b/src/files.c
index deac9e3..8189375 100644
--- a/src/files.c
+++ b/src/files.c
@@ -22,13 +22,13 @@
 #include <assert.h>
 #include "files.h"
 #include "error.h"
-#include "cp866.h"
 
 #include "map.h" // MAP_load
 
 #include "common/streams.h"
 #include "common/files.h"
 #include "common/wadres.h"
+#include "common/cp866.h"
 
 int d_start, d_end;
 static int m_start, m_end;
diff --git a/src/gl/render.c b/src/gl/render.c
index d0aab9f..db23448 100644
--- a/src/gl/render.c
+++ b/src/gl/render.c
@@ -37,7 +37,7 @@
 #include "view.h"
 #include "switch.h" // sw_secrets
 
-#include "cp866.h"
+#include "common/cp866.h"
 #include "common/endianness.h"
 
 #ifdef __APPLE__
diff --git a/src/input.c b/src/input.c
index 0a74043..d76f6e5 100644
--- a/src/input.c
+++ b/src/input.c
@@ -14,7 +14,8 @@
  */
 
 #include "input.h"
-#include "cp866.h"
+#include "common/cp866.h"
+
 #include <assert.h>
 
 static char keystate[KEY__LAST + 1];
diff --git a/src/map.c b/src/map.c
index a5b5bd8..8f1fb68 100644
--- a/src/map.c
+++ b/src/map.c
@@ -30,10 +30,10 @@
 #include <string.h>
 #include <assert.h>
 #include "error.h"
-#include "cp866.h"
 
 #include "common/streams.h"
 #include "common/files.h"
+#include "common/cp866.h"
 
 enum {
   MB_COMMENT = -1, MB_END = 0,
diff --git a/src/sdl2/main.c b/src/sdl2/main.c
index 1c20e9e..9533040 100644
--- a/src/sdl2/main.c
+++ b/src/sdl2/main.c
@@ -26,8 +26,6 @@
 #include "system.h"
 #include "input.h"
 
-#include "cp866.h"
-
 #include "player.h" // pl1 pl2
 #include "menu.h" // G_keyf
 #include "error.h" // logo
@@ -42,6 +40,8 @@
 #include "music.h" // S_initmusic S_updatemusic S_donemusic
 #include "render.h" // R_init R_draw R_done
 
+#include "common/cp866.h"
+
 #define TITLE_STR "Doom 2D (SDL2)"
 
 static Uint32 ticks;
diff --git a/src/soft/render.c b/src/soft/render.c
index c1b54e5..6c804a9 100644
--- a/src/soft/render.c
+++ b/src/soft/render.c
@@ -41,7 +41,7 @@
 #include "music.h"
 #include "system.h"
 
-#include "cp866.h"
+#include "common/cp866.h"
 
 // game
 static vgaimg *scrnh[3]; // TITLEPIC INTERPIC ENDPIC
-- 
2.29.2