[Refactor] #3346 X11 にだけ依存するコードをmain/ からmain-unix/ へ移動させた

diff --git a/src/Makefile.am b/src/Makefile.am
index 8866747..087a462 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -395,10 +395,10 @@ hengband_SOURCES = \
        main/scene-table-monster.cpp main/scene-table-monster.h \
        main/sound-definitions-table.cpp main/sound-definitions-table.h \
        main/sound-of-music.cpp main/sound-of-music.h \
-       main/x11-gamma-builder.cpp main/x11-gamma-builder.h \
-       main/x11-type-string.cpp main/x11-type-string.h \
        \
        main-unix/unix-user-ids.cpp main-unix/unix-user-ids.h \
+       main-unix/x11-gamma-builder.cpp main-unix/x11-gamma-builder.h \
+       main-unix/x11-type-string.cpp main-unix/x11-type-string.h \
        \
        market/arena-info-table.cpp market/arena-info-table.h \
        market/building-initializer.cpp market/building-initializer.h \

diff --git a/src/maid-x11.cpp b/src/maid-x11.cpp
index c7ca3fa..b432013 100644 (file)
--- a/src/maid-x11.cpp
+++ b/src/maid-x11.cpp
@@ -10,7 +10,7 @@
 
 #ifdef USE_X11
 
-#include "main/x11-gamma-builder.h"
+#include "main-unix/x11-gamma-builder.h"
 #include <math.h>
 
 /*

diff --git a/src/main/x11-gamma-builder.cpp b/src/main-unix/x11-gamma-builder.cpp
similarity index 99%
rename from src/main/x11-gamma-builder.cpp
rename to src/main-unix/x11-gamma-builder.cpp
index 8340f28..fffcc98 100644 (file)
--- a/src/main/x11-gamma-builder.cpp
+++ b/src/main-unix/x11-gamma-builder.cpp
@@ -48,7 +48,7 @@
  * are left with "meaningful" values.
  */
 
-#include "main/x11-gamma-builder.h"
+#include "main-unix/x11-gamma-builder.h"
 #include "system/angband.h"
 
 /* Table of gamma values */

diff --git a/src/main/x11-gamma-builder.h b/src/main-unix/x11-gamma-builder.h
similarity index 100%
rename from src/main/x11-gamma-builder.h
rename to src/main-unix/x11-gamma-builder.h

diff --git a/src/main/x11-type-string.cpp b/src/main-unix/x11-type-string.cpp
similarity index 95%
rename from src/main/x11-type-string.cpp
rename to src/main-unix/x11-type-string.cpp
index ab3a4e4..6fbcbf1 100644 (file)
--- a/src/main/x11-type-string.cpp
+++ b/src/main-unix/x11-type-string.cpp
@@ -6,7 +6,7 @@
  * @details Windowsでは使わない
  */
 
-#include "main/x11-type-string.h"
+#include "main-unix/x11-type-string.h"
 #include "term/gameterm.h"
 
 /*

diff --git a/src/main/x11-type-string.h b/src/main-unix/x11-type-string.h
similarity index 100%
rename from src/main/x11-type-string.h
rename to src/main-unix/x11-type-string.h

diff --git a/src/main-x11.cpp b/src/main-x11.cpp
index 75ed0a5..ab5b5c8 100644 (file)
--- a/src/main-x11.cpp
+++ b/src/main-x11.cpp
@@ -95,9 +95,9 @@
 #include "io/files-util.h"
 #include "locale/japanese.h"
 #include "locale/utf-8.h"
+#include "main-unix/x11-type-string.h"
 #include "main/sound-definitions-table.h"
 #include "main/sound-of-music.h"
-#include "main/x11-type-string.h"
 #include "system/angband.h"
 #include "system/system-variables.h"
 #include "term/gameterm.h"