Skip to content

Revert "Small fixes to install poco correctly and compile on modern GCC" #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
PsyCommando wants to merge 1 commit into from
Closed

Revert "Small fixes to install poco correctly and compile on modern GCC" #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ppmdu_2/include/utils/pugixml_utils.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ psycommando@gmail.com
#include <string>
#include <pugixml.hpp>
#include <codecvt>
#include <cstdint>
#include <locale>
#include <sstream>

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

#endif
#endif
4 changes: 1 addition & 3 deletions ppmdu_2/src/ppmdu/pmd2/pmd2_scripts_xml_io.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,11 @@
#include <ppmdu/pmd2/pmd2_scripts_opcodes.hpp>
#include <ppmdu/pmd2/pmd2_xml_sniffer.hpp>
#include <utils/pugixml_utils.hpp>
#include <string.h>
#include <utils/library_wide.hpp>
//#include <utils/multiple_task_handler.hpp>
#include <utils/parallel_tasks.hpp>
#include <ppmdu/fmts/ssb.hpp>
#include <atomic>
#include <functional>
#include <thread>
#include <unordered_set>
#include <Poco/DirectoryIterator.h>
Expand Down Expand Up @@ -3918,4 +3916,4 @@ namespace pmd2
}


};
};
9 changes: 2 additions & 7 deletions vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,9 @@
"name": "ppmdu-2",
"version": "1.0.0",
"dependencies": [
{
"name": "poco",
"features": [
"util"
]
},
"poco",
"libpng",
"zlib",
"pugixml"
]
}
}
Loading