• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision6353c563b992c72db09593c839307bb01893dbcd (tree)
Time2019-06-12 21:32:03
Authordeskull <deskull@user...>
Commiterdeskull

Log Message

[Refactor] #37353 gameoption.c/h を cmd-gameoption.c/h に改名.その際にLNK4042の原因を知り修正.

Change Summary

Incremental Difference

--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj
@@ -145,6 +145,7 @@
145145 <ClCompile Include="..\..\src\cmd-basic.c" />
146146 <ClCompile Include="..\..\src\cmd-dump.c" />
147147 <ClCompile Include="..\..\src\cmd-eat.c" />
148+ <ClCompile Include="..\..\src\cmd-gameoption.c" />
148149 <ClCompile Include="..\..\src\cmd-hissatsu.c" />
149150 <ClCompile Include="..\..\src\cmd-mane.c" />
150151 <ClCompile Include="..\..\src\cmd-pet.c" />
@@ -173,7 +174,6 @@
173174 <ClCompile Include="..\..\src\object-curse.c" />
174175 <ClCompile Include="..\..\src\object-ego.c" />
175176 <ClCompile Include="..\..\src\object-flavor.c" />
176- <ClCompile Include="..\..\src\object-flavor.h" />
177177 <ClCompile Include="..\..\src\object-hook.c" />
178178 <ClCompile Include="..\..\src\objectkind.c" />
179179 <ClCompile Include="..\..\src\objectkind-hook.c" />
@@ -208,6 +208,7 @@
208208 <ClInclude Include="..\..\src\chuukei.h" />
209209 <ClInclude Include="..\..\src\cmd-basic.h" />
210210 <ClInclude Include="..\..\src\cmd-dump.h" />
211+ <ClInclude Include="..\..\src\cmd-gameoption.h" />
211212 <ClInclude Include="..\..\src\cmd-hissatsu.h" />
212213 <ClInclude Include="..\..\src\cmd-item.h" />
213214 <ClInclude Include="..\..\src\cmd-magiceat.h" />
@@ -224,7 +225,6 @@
224225 <ClCompile Include="..\..\src\cmd-magiceat.c" />
225226 <ClCompile Include="..\..\src\cmd-spell.c" />
226227 <ClCompile Include="..\..\src\files.c" />
227- <ClCompile Include="..\..\src\gameoption.c" />
228228 <ClCompile Include="..\..\src\grid.c" />
229229 <ClCompile Include="..\..\src\inet.c" />
230230 <ClCompile Include="..\..\src\japanese.c" />
@@ -292,6 +292,7 @@
292292 <ClCompile Include="..\..\src\z-util.c" />
293293 <ClCompile Include="..\..\src\z-virt.c" />
294294 <ClInclude Include="..\..\src\english.h" />
295+ <ClInclude Include="..\..\src\object-flavor.h" />
295296 <ClInclude Include="japanese.h" />
296297 </ItemGroup>
297298 <ItemGroup>
@@ -312,7 +313,6 @@
312313 <ClInclude Include="..\..\src\floor-save.h" />
313314 <ClInclude Include="..\..\src\floor-town.h" />
314315 <ClInclude Include="..\..\src\floor.h" />
315- <ClInclude Include="..\..\src\gameoption.h" />
316316 <ClInclude Include="..\..\src\gamevalue.h" />
317317 <ClInclude Include="..\..\src\geometry.h" />
318318 <ClInclude Include="..\..\src\grid.h" />
--- a/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
+++ b/Hengband_vcs2017/Hengband/Hengband.vcxproj.filters
@@ -180,12 +180,6 @@
180180 <ClCompile Include="..\..\src\cmd-mane.c">
181181 <Filter>cmd</Filter>
182182 </ClCompile>
183- <ClCompile Include="..\..\src\object-flavor.h">
184- <Filter>object</Filter>
185- </ClCompile>
186- <ClCompile Include="..\..\src\object-flavor.c">
187- <Filter>object</Filter>
188- </ClCompile>
189183 <ClCompile Include="..\..\src\cmd-basic.c">
190184 <Filter>cmd</Filter>
191185 </ClCompile>
@@ -322,9 +316,6 @@
322316 <ClCompile Include="..\..\src\core.c">
323317 <Filter>core</Filter>
324318 </ClCompile>
325- <ClCompile Include="..\..\src\gameoption.c">
326- <Filter>core</Filter>
327- </ClCompile>
328319 <ClCompile Include="..\..\src\history.c">
329320 <Filter>player</Filter>
330321 </ClCompile>
@@ -400,6 +391,12 @@
400391 <ClCompile Include="..\..\src\english.c">
401392 <Filter>locale</Filter>
402393 </ClCompile>
394+ <ClCompile Include="..\..\src\cmd-gameoption.c">
395+ <Filter>cmd</Filter>
396+ </ClCompile>
397+ <ClCompile Include="..\..\src\object-flavor.c">
398+ <Filter>object</Filter>
399+ </ClCompile>
403400 </ItemGroup>
404401 <ItemGroup>
405402 <ClInclude Include="..\..\src\gamevalue.h" />
@@ -698,9 +695,6 @@
698695 <ClInclude Include="..\..\src\angband.h">
699696 <Filter>core</Filter>
700697 </ClInclude>
701- <ClInclude Include="..\..\src\gameoption.h">
702- <Filter>core</Filter>
703- </ClInclude>
704698 <ClInclude Include="..\..\src\history.h">
705699 <Filter>player</Filter>
706700 </ClInclude>
@@ -776,6 +770,12 @@
776770 <ClInclude Include="..\..\src\english.h">
777771 <Filter>locale</Filter>
778772 </ClInclude>
773+ <ClInclude Include="..\..\src\cmd-gameoption.h">
774+ <Filter>cmd</Filter>
775+ </ClInclude>
776+ <ClInclude Include="..\..\src\object-flavor.h">
777+ <Filter>object</Filter>
778+ </ClInclude>
779779 </ItemGroup>
780780 <ItemGroup>
781781 <None Include="..\..\src\wall.bmp" />
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,7 +14,7 @@ hengband_SOURCES = \
1414 bldg.c bldg.h chest.c chest.h chuukei.c \
1515 cmd-basic.c cmd-basic.h cmd-dump.c cmd-dump.h cmd-activate.c cmd-activate.h cmd-eat.c cmd-eat.h \
1616 cmd-item.c cmd-item.h cmd-magiceat.c cmd-magiceat.h \
17- cmd-mane.c cmd-mane.h cmd-pet.c cmd-pet.h \
17+ cmd-mane.c cmd-mane.h cmd-pet.c cmd-pet.h cmd-gameoption.c cmd-gameoption.h\
1818 cmd-quaff.c cmd-quaff.h cmd-read.c cmd-read.h cmd-spell.c cmd-spell.h \
1919 cmd-usestaff.c cmd-usestaff.h cmd-zaprod.c cmd-zaprod.h cmd-zapwand.c \
2020 cmd-zapwand.h cmd-smith.c cmd-smith.h cmd-hissatsu.c cmd-hissatsu.h\
@@ -29,7 +29,7 @@ hengband_SOURCES = \
2929 feature.c feature.h \
3030 geometry.c geometry.h \
3131 \
32- gameoption.c gameoption.h gamevalue.h \
32+ gamevalue.h \
3333 grid.c grid.h h-basic.h h-config.h h-define.h \
3434 history.h history.c \
3535 h-system.h h-type.h inet.c inet.h init.c init.h \
--- a/src/angband.h
+++ b/src/angband.h
@@ -38,7 +38,7 @@
3838 * Include the "Angband" configuration header
3939 */
4040 #include "gamevalue.h"
41-#include "gameoption.h"
41+#include "cmd-gameoption.h"
4242
4343 #include "geometry.h"
4444 #include "grid.h"
--- a/src/gameoption.c
+++ b/src/cmd-gameoption.c
@@ -1,7 +1,7 @@
11 #include "angband.h"
22
33 #include "autopick.h"
4-#include "gameoption.h"
4+#include "cmd-gameoption.h"
55 #include "term.h"
66 #include "view-mainwindow.h"
77 #include "cmd-dump.h"
Show on old repository browser