cp866: move to common/

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 6ebb4255fed453583c5d95455e2652316985b4cb..86b6d227c96893cbc7cde91cdc83ca5c31a7f406 100644 (file)
--- 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 deac9e3e2898da9726eeb48a4bc84d8d36b59ec8..8189375ee5814b9cba20e68889608cbfdaa85b90 100644 (file)
--- 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 d0aab9fac9cc1386fa741f932367de0a703b72c3..db23448f445dc9f999a4a87b710a6dbf5c9e4fd3 100644 (file)
--- 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 0a74043ab2b9c681bf832db30e8bfef5c1521fe7..d76f6e51c63b7344d57ea2c27b3e7ae3af7a3dcb 100644 (file)
--- 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 a5b5bd8a261d2ca75ad00e2cf377a06bdc8cea55..8f1fb68328006b9178b18ca1b9efcc0b794bec6d 100644 (file)
--- 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 1c20e9ea746035dd0a8a49bec7beed072f86b99b..9533040a3454bf9ae127a4651619ece810a5f1a0 100644 (file)
--- 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 c1b54e504265c12e042bdf8366f24676899e82e8..6c804a9a0d5f1832085ba0c9e68119f5cd5f40f3 100644 (file)
--- 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