Skip to content

Commit ec835dd

Browse files
authored
Revert "Small fixes to install poco correctly and compile on modern GCC"
1 parent 90d945e commit ec835dd

3 files changed

Lines changed: 4 additions & 12 deletions

File tree

ppmdu_2/include/utils/pugixml_utils.hpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ psycommando@gmail.com
1111
#include <string>
1212
#include <pugixml.hpp>
1313
#include <codecvt>
14-
#include <cstdint>
1514
#include <locale>
1615
#include <sstream>
1716

@@ -213,4 +212,4 @@ namespace pugixmlutils
213212
void HandleParsingError( const pugi::xml_parse_result & result, const std::string & xmlpath );
214213
};
215214

216-
#endif
215+
#endif

ppmdu_2/src/ppmdu/pmd2/pmd2_scripts_xml_io.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,11 @@
99
#include <ppmdu/pmd2/pmd2_scripts_opcodes.hpp>
1010
#include <ppmdu/pmd2/pmd2_xml_sniffer.hpp>
1111
#include <utils/pugixml_utils.hpp>
12-
#include <string.h>
1312
#include <utils/library_wide.hpp>
1413
//#include <utils/multiple_task_handler.hpp>
1514
#include <utils/parallel_tasks.hpp>
1615
#include <ppmdu/fmts/ssb.hpp>
1716
#include <atomic>
18-
#include <functional>
1917
#include <thread>
2018
#include <unordered_set>
2119
#include <Poco/DirectoryIterator.h>
@@ -3918,4 +3916,4 @@ namespace pmd2
39183916
}
39193917

39203918

3921-
};
3919+
};

vcpkg.json

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,9 @@
22
"name": "ppmdu-2",
33
"version": "1.0.0",
44
"dependencies": [
5-
{
6-
"name": "poco",
7-
"features": [
8-
"util"
9-
]
10-
},
5+
"poco",
116
"libpng",
127
"zlib",
138
"pugixml"
149
]
15-
}
10+
}

0 commit comments

Comments
 (0)