diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..db53c36
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,8 @@
+# intermediate files
+Win32/
+x64/
+resources/out/
+*.sdf
+*.suo
+*.opensdf
+*.user
diff --git a/tinyxml2.sln b/tinyxml2.sln
index 7073405..af8daa5 100644
--- a/tinyxml2.sln
+++ b/tinyxml2.sln
@@ -6,13 +6,19 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
+ Debug|x64 = Debug|x64
Release|Win32 = Release|Win32
+ Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{16A1D446-5415-444E-A7B4-F35B7DA7EE8C}.Debug|Win32.ActiveCfg = Debug|Win32
{16A1D446-5415-444E-A7B4-F35B7DA7EE8C}.Debug|Win32.Build.0 = Debug|Win32
+ {16A1D446-5415-444E-A7B4-F35B7DA7EE8C}.Debug|x64.ActiveCfg = Debug|x64
+ {16A1D446-5415-444E-A7B4-F35B7DA7EE8C}.Debug|x64.Build.0 = Debug|x64
{16A1D446-5415-444E-A7B4-F35B7DA7EE8C}.Release|Win32.ActiveCfg = Release|Win32
{16A1D446-5415-444E-A7B4-F35B7DA7EE8C}.Release|Win32.Build.0 = Release|Win32
+ {16A1D446-5415-444E-A7B4-F35B7DA7EE8C}.Release|x64.ActiveCfg = Release|x64
+ {16A1D446-5415-444E-A7B4-F35B7DA7EE8C}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/tinyxml2/tinyxml2.vcxproj b/tinyxml2/tinyxml2.vcxproj
index 961f5b3..ec88e54 100644
--- a/tinyxml2/tinyxml2.vcxproj
+++ b/tinyxml2/tinyxml2.vcxproj
@@ -5,15 +5,24 @@
Debug
Win32
+
+ Debug
+ x64
+
Release
Win32
+
+ Release
+ x64
+
{16A1D446-5415-444E-A7B4-F35B7DA7EE8C}
Win32Proj
tinyxml2
+ $(VCTargetsPath11)
@@ -21,27 +30,54 @@
true
Unicode
+
+ Application
+ true
+ Unicode
+
Application
false
true
Unicode
+
+ Application
+ false
+ true
+ Unicode
+
+
+
+
+
+
+
true
+ $(SolutionDir)$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+
+
+ true
false
+ $(SolutionDir)$(Platform)\$(Configuration)\
+ $(Platform)\$(Configuration)\
+
+
+ false
@@ -57,6 +93,20 @@
true
+
+
+
+
+ Level4
+ Disabled
+ WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ false
+
+
+ Console
+ true
+
+
Level3
@@ -66,6 +116,25 @@
true
true
WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ true
+
+
+ Console
+ true
+ true
+ true
+
+
+
+
+ Level3
+
+
+ MaxSpeed
+ true
+ true
+ WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
+ true
Console
diff --git a/xmltest.cpp b/xmltest.cpp
index 8e5e01f..969aa9e 100644
--- a/xmltest.cpp
+++ b/xmltest.cpp
@@ -155,6 +155,8 @@ int main( int /*argc*/, const char ** /*argv*/ )
#pragma warning ( disable : 4996 ) // Fail to see a compelling reason why this should be deprecated.
#endif
+ CreateDirectory( L"resources/out/", NULL );
+
FILE* fp = fopen( "resources/dream.xml", "r" );
if ( !fp ) {
printf( "Error opening test file 'dream.xml'.\n"
@@ -297,7 +299,7 @@ int main( int /*argc*/, const char ** /*argv*/ )
XMLDocument doc;
doc.LoadFile( "resources/dream.xml" );
- doc.SaveFile( "resources/dreamout.xml" );
+ doc.SaveFile( "resources/out/dreamout.xml" );
doc.PrintError();
XMLTest( "Dream", "xml version=\"1.0\"",
@@ -311,7 +313,7 @@ int main( int /*argc*/, const char ** /*argv*/ )
doc.LastChild()->LastChild()->LastChild()->LastChild()->LastChildElement()->GetText() );
XMLDocument doc2;
- doc2.LoadFile( "resources/dreamout.xml" );
+ doc2.LoadFile( "resources/out/dreamout.xml" );
XMLTest( "Dream-out", "xml version=\"1.0\"",
doc2.FirstChild()->ToDeclaration()->Value() );
XMLTest( "Dream-out", true, doc2.FirstChild()->NextSibling()->ToUnknown() ? true : false );
@@ -408,7 +410,7 @@ int main( int /*argc*/, const char ** /*argv*/ )
text->Value() );
// Now try for a round trip.
- doc.SaveFile( "resources/utf8testout.xml" );
+ doc.SaveFile( "resources/out/utf8testout.xml" );
// Check the round trip.
int okay = 0;
@@ -541,7 +543,7 @@ int main( int /*argc*/, const char ** /*argv*/ )
#pragma warning ( push )
#pragma warning ( disable : 4996 ) // Fail to see a compelling reason why this should be deprecated.
#endif
- FILE* textfile = fopen( "resources/textfile.txt", "w" );
+ FILE* textfile = fopen( "resources/out/textfile.txt", "w" );
#if defined(_MSC_VER)
#pragma warning ( pop )
#endif
@@ -555,7 +557,7 @@ int main( int /*argc*/, const char ** /*argv*/ )
#pragma warning ( push )
#pragma warning ( disable : 4996 ) // Fail to see a compelling reason why this should be deprecated.
#endif
- textfile = fopen( "resources/textfile.txt", "r" );
+ textfile = fopen( "resources/out/textfile.txt", "r" );
#if defined(_MSC_VER)
#pragma warning ( pop )
#endif
@@ -624,9 +626,9 @@ int main( int /*argc*/, const char ** /*argv*/ )
XMLDocument doc;
doc.Parse( doctype );
- doc.SaveFile( "resources/test7.xml" );
+ doc.SaveFile( "resources/out/test7.xml" );
doc.DeleteChild( doc.RootElement() );
- doc.LoadFile( "resources/test7.xml" );
+ doc.LoadFile( "resources/out/test7.xml" );
doc.Print();
const XMLUnknown* decl = doc.FirstChild()->NextSibling()->ToUnknown();