リビジョン | fc8c3ce94ab50e729d33e23c5501449112b87bf6 (tree) |
---|---|
日時 | 2017-08-17 19:50:57 |
作者 | Deskull <desull@user...> |
コミッター | Deskull |
[BUGGY] libxml導入中間コミット。 / Introducing libxml.
@@ -60,8 +60,8 @@ | ||
60 | 60 | <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(Configuration)\</IntDir> |
61 | 61 | </PropertyGroup> |
62 | 62 | <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> | |
65 | 65 | </PropertyGroup> |
66 | 66 | <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> |
67 | 67 | <ClCompile> |
@@ -76,7 +76,7 @@ | ||
76 | 76 | <DisableSpecificWarnings>4127;4996;4244;4820;%(DisableSpecificWarnings)</DisableSpecificWarnings> |
77 | 77 | </ClCompile> |
78 | 78 | <Link> |
79 | - <AdditionalDependencies>winmm.lib;wsock32.lib;%(AdditionalDependencies)</AdditionalDependencies> | |
79 | + <AdditionalDependencies>winmm.lib;wsock32.lib;%(AdditionalDependencies);libxml2.a;</AdditionalDependencies> | |
80 | 80 | <GenerateDebugInformation>true</GenerateDebugInformation> |
81 | 81 | <TargetMachine>MachineX86</TargetMachine> |
82 | 82 | <ShowProgress>LinkVerbose</ShowProgress> |
@@ -185,6 +185,7 @@ | ||
185 | 185 | <ClCompile Include="..\..\src\wild.c" /> |
186 | 186 | <ClCompile Include="..\..\src\wizard1.c" /> |
187 | 187 | <ClCompile Include="..\..\src\wizard2.c" /> |
188 | + <ClCompile Include="..\..\src\xmlfiles.c" /> | |
188 | 189 | <ClCompile Include="..\..\src\xtra1.c" /> |
189 | 190 | <ClCompile Include="..\..\src\xtra2.c" /> |
190 | 191 | <ClCompile Include="..\..\src\z-form.c" /> |
@@ -211,6 +212,7 @@ | ||
211 | 212 | <ClInclude Include="..\..\src\rooms.h" /> |
212 | 213 | <ClInclude Include="..\..\src\streams.h" /> |
213 | 214 | <ClInclude Include="..\..\src\types.h" /> |
215 | + <ClInclude Include="..\..\src\xmlfiles.h" /> | |
214 | 216 | <ClInclude Include="..\..\src\z-config.h" /> |
215 | 217 | <ClInclude Include="..\..\src\z-form.h" /> |
216 | 218 | <ClInclude Include="..\..\src\z-rand.h" /> |
@@ -40,6 +40,7 @@ | ||
40 | 40 | */ |
41 | 41 | |
42 | 42 | #include "angband.h" |
43 | +#include "xmlfiles.h" | |
43 | 44 | |
44 | 45 | |
45 | 46 |
@@ -1096,6 +1097,12 @@ void do_cmd_change_name(void) | ||
1096 | 1097 | } |
1097 | 1098 | } |
1098 | 1099 | |
1100 | + /* XML File dump */ | |
1101 | + else if (c == 'x') | |
1102 | + { | |
1103 | + dumpPlayerXml(); | |
1104 | + } | |
1105 | + | |
1099 | 1106 | /* Toggle mode */ |
1100 | 1107 | else if (c == 'h') |
1101 | 1108 | { |
@@ -15,9 +15,6 @@ | ||
15 | 15 | |
16 | 16 | #include "angband.h" |
17 | 17 | |
18 | -#include <libxml/xmlmemory.h> | |
19 | -#include <libxml/parser.h> | |
20 | - | |
21 | 18 | /* |
22 | 19 | * You may or may not want to use the following "#undef". |
23 | 20 | */ |