• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: コミット

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


コミットメタ情報

リビジョンfc8c3ce94ab50e729d33e23c5501449112b87bf6 (tree)
日時2017-08-17 19:50:57
作者Deskull <desull@user...>
コミッターDeskull

ログメッセージ

[BUGGY] libxml導入中間コミット。 / Introducing libxml.

変更サマリ

差分

--- a/Hengband_vcs2015/Hengband/Hengband.vcxproj
+++ b/Hengband_vcs2015/Hengband/Hengband.vcxproj
@@ -60,8 +60,8 @@
6060 <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir>
6161 </PropertyGroup>
6262 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
63- <IncludePath>..\..\libiconv-1.9.2-1-lib\include;..\..\libxslt-1.1.26.win32\include;..\..\libxml2-2.7.8.win32\include;$(IncludePath)</IncludePath>
64- <LibraryPath>..\..\libiconv-1.9.2-1-lib\lib;..\..\libxslt-1.1.26.win32\lib;..\..\libxml2-2.7.8.win32\lib;$(LibraryPath)</LibraryPath>
63+ <IncludePath>..\..\libxml2\include;..\..\iconv\include;$(IncludePath)</IncludePath>
64+ <LibraryPath>..\..\libxml2\lib;..\..\iconv\lib;$(LibraryPath)</LibraryPath>
6565 </PropertyGroup>
6666 <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
6767 <ClCompile>
@@ -76,7 +76,7 @@
7676 <DisableSpecificWarnings>4127;4996;4244;4820;%(DisableSpecificWarnings)</DisableSpecificWarnings>
7777 </ClCompile>
7878 <Link>
79- <AdditionalDependencies>winmm.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies>
79+ <AdditionalDependencies>winmm.lib;wsock32.lib;%(AdditionalDependencies);libxml2.a;</AdditionalDependencies>
8080 <GenerateDebugInformation>true</GenerateDebugInformation>
8181 <TargetMachine>MachineX86</TargetMachine>
8282 <ShowProgress>LinkVerbose</ShowProgress>
@@ -185,6 +185,7 @@
185185 <ClCompile Include="..\..\src\wild.c" />
186186 <ClCompile Include="..\..\src\wizard1.c" />
187187 <ClCompile Include="..\..\src\wizard2.c" />
188+ <ClCompile Include="..\..\src\xmlfiles.c" />
188189 <ClCompile Include="..\..\src\xtra1.c" />
189190 <ClCompile Include="..\..\src\xtra2.c" />
190191 <ClCompile Include="..\..\src\z-form.c" />
@@ -211,6 +212,7 @@
211212 <ClInclude Include="..\..\src\rooms.h" />
212213 <ClInclude Include="..\..\src\streams.h" />
213214 <ClInclude Include="..\..\src\types.h" />
215+ <ClInclude Include="..\..\src\xmlfiles.h" />
214216 <ClInclude Include="..\..\src\z-config.h" />
215217 <ClInclude Include="..\..\src\z-form.h" />
216218 <ClInclude Include="..\..\src\z-rand.h" />
--- a/src/cmd4.c
+++ b/src/cmd4.c
@@ -40,6 +40,7 @@
4040 */
4141
4242 #include "angband.h"
43+#include "xmlfiles.h"
4344
4445
4546
@@ -1096,6 +1097,12 @@ void do_cmd_change_name(void)
10961097 }
10971098 }
10981099
1100+ /* XML File dump */
1101+ else if (c == 'x')
1102+ {
1103+ dumpPlayerXml();
1104+ }
1105+
10991106 /* Toggle mode */
11001107 else if (c == 'h')
11011108 {
--- a/src/files.c
+++ b/src/files.c
@@ -15,9 +15,6 @@
1515
1616 #include "angband.h"
1717
18-#include <libxml/xmlmemory.h>
19-#include <libxml/parser.h>
20-
2118 /*
2219 * You may or may not want to use the following "#undef".
2320 */
旧リポジトリブラウザで表示