[Refactor] #38862 Moved readdib.c/h to term/

diff --git a/Hengband/Hengband/Hengband.vcxproj b/Hengband/Hengband/Hengband.vcxproj
index 54859c7..0af37f3 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj
+++ b/Hengband/Hengband/Hengband.vcxproj
@@ -461,7 +461,7 @@
     <ClCompile Include="..\..\src\object\object1.c" />\r
     <ClCompile Include="..\..\src\object\object2.c" />\r
     <ClCompile Include="..\..\src\mind\racial.c" />\r
-    <ClCompile Include="..\..\src\readdib.c" />\r
+    <ClCompile Include="..\..\src\term\readdib.c" />\r
     <ClCompile Include="..\..\src\realm\realm-arcane.c" />\r
     <ClCompile Include="..\..\src\realm\realm-chaos.c" />\r
     <ClCompile Include="..\..\src\realm\realm-hex.c" />\r
@@ -676,7 +676,7 @@
     <ClInclude Include="..\..\src\player\player-status.h" />\r
     <ClInclude Include="..\..\src\quest.h" />\r
     <ClInclude Include="..\..\src\mind\racial.h" />\r
-    <ClInclude Include="..\..\src\readdib.h" />\r
+    <ClInclude Include="..\..\src\term\readdib.h" />\r
     <ClInclude Include="..\..\src\realm\realm-arcane.h" />\r
     <ClInclude Include="..\..\src\realm\realm-chaos.h" />\r
     <ClInclude Include="..\..\src\realm\realm-craft.h" />\r

diff --git a/Hengband/Hengband/Hengband.vcxproj.filters b/Hengband/Hengband/Hengband.vcxproj.filters
index baa0987..6a90107 100644 (file)
--- a/Hengband/Hengband/Hengband.vcxproj.filters
+++ b/Hengband/Hengband/Hengband.vcxproj.filters
@@ -2,7 +2,6 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="..\..\src\main-win.c" />
-    <ClCompile Include="..\..\src\readdib.c" />
     <ClCompile Include="..\..\src\warning.c" />
     <ClCompile Include="..\..\src\chuukei.c">
       <Filter>io</Filter>
@@ -835,9 +834,11 @@
     <ClCompile Include="..\..\src\main\init.c">
       <Filter>main</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\src\term\readdib.c">
+      <Filter>term</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="..\..\src\readdib.h" />
     <ClInclude Include="..\..\src\warning.h" />
     <ClInclude Include="..\..\src\chuukei.h">
       <Filter>io</Filter>
@@ -1715,6 +1716,9 @@
     <ClInclude Include="..\..\src\main\init.h">
       <Filter>main</Filter>
     </ClInclude>
+    <ClInclude Include="..\..\src\term\readdib.h">
+      <Filter>term</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="..\..\src\wall.bmp" />

diff --git a/src/Makefile.am b/src/Makefile.am
index 6769c79..e2ad8c9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -38,6 +38,8 @@ hengband_SOURCES = \
        \
        main/music-definitions-table.c main/music-definitions-table.h \
        main/sound-definitions-table.c main/sound-definitions-table.h \
+       main/init.c main/init.h \
+       \
        market/arena-info-table.c market/arena-info-table.h \
        market/building.c market/building.h \
        market/building-util.c market/building-util.h \
@@ -120,7 +122,7 @@ hengband_SOURCES = \
        grid/grid.c grid/grid.h grid/trap.c grid/trap.h \
        geometry.c geometry.h \
        \
-       inet.c inet.h init.c init.h \
+       inet.c inet.h \
        main.c main-x11.c main-gcu.c \
        \
        mind/mind.c mind/mind.h \
@@ -300,7 +302,7 @@ hengband_SOURCES = \
 
 EXTRA_hengband_SOURCES = \
        angband.ico angband.rc ang_eng.rc maid-x11.c main-win.c \
-       makefile.bcc makefile.std readdib.c readdib.h wall.bmp
+       makefile.bcc makefile.std term/readdib.c term/readdib.h wall.bmp
 
 EXTRA_DIST = \
        gcc-wrap
@@ -311,7 +313,8 @@ COMPILE = $(srcdir)/gcc-wrap $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
        $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) \
        -Iautopick -Ibirth -Icmd -Icombat -Icore -Idungeon -Ieffect -Ifloor \
        -Igrid -Iinventory -Iio -Iknowledge -Imarket -Imind -Imonster -Imutation \
-       -Iobject -Iplayer -Irealm -Iroom -Ispell -Isystem -Iview -Iwizard -Iworld
+       -Iobject -Iplayer -Irealm -Iroom -Ispell -Isystem -Iterm -Iview -Iwizard \
+       -Iworld
 
 install-exec-hook:
 if SET_GID

diff --git a/src/main-win.c b/src/main-win.c
index f86a54b..a8f5a3a 100644 (file)
--- a/src/main-win.c
+++ b/src/main-win.c
@@ -271,7 +271,7 @@
 /*
  * Include the support for loading bitmaps
  */
-#include "readdib.h"
+#include "term/readdib.h"
 
 #define MoveTo(H,X,Y) MoveToEx(H, X, Y, NULL)
 

diff --git a/src/readdib.c b/src/term/readdib.c
similarity index 99%
rename from src/readdib.c
rename to src/term/readdib.c
index e5e7b03..2fa32a3 100644 (file)
--- a/src/readdib.c
+++ b/src/term/readdib.c
@@ -22,7 +22,7 @@
 
 #include <windows.h>
 
-#include "readdib.h"
+#include "term/readdib.h"
 
 /*
  * Needed for lcc-win32

diff --git a/src/readdib.h b/src/term/readdib.h
similarity index 100%
rename from src/readdib.h
rename to src/term/readdib.h