Fix building with mingw32

oreo639 · Sep 9, 2020 · 3ebf8a6 · 3ebf8a6
1 parent 45082a4
commit 3ebf8a6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/configure.ac b/configure.ac
@@ -14,7 +14,8 @@ AC_DEFINE(APP_NAME, "SDATxtract", Name of application)
 AC_DEFINE_UNQUOTED(APP_VERSION_MAJOR, 0, Major version of application)
 AC_DEFINE_UNQUOTED(APP_VERSION_MINOR, 2, Minor version of application)
 AC_DEFINE_UNQUOTED(APP_VERSION_MICRO, 0, Micro version of application)
-AC_DEFINE(APP_VERSION_FULL, "APP_VERSION_MAJOR.APP_VERSION_MINOR.APP_VERSION_MICRO", Full version of application)
+AC_DEFINE_UNQUOTED(APP_VERSION_FULL_RAW, APP_VERSION_MAJOR.APP_VERSION_MINOR.APP_VERSION_MICRO, Full version of application)
+AC_DEFINE_UNQUOTED(APP_VERSION_FULL, STRINGIFY(APP_VERSION_FULL_RAW), Full version of application string)
 
 AC_CANONICAL_BUILD
 AC_CANONICAL_HOST

diff --git a/src/main.cpp b/src/main.cpp
@@ -113,7 +113,7 @@ int main(int argc, char* argv[])
 			warning("No SDATs found in file: %s\n", argv[optind]);
 		} else {
 			if (isNds) {
-				std::string outdir = fs::path(argv[optind]).stem();
+				std::string outdir = fs::path(argv[optind]).stem().string();
 				fs::create_directory(outdir);
 				fs::current_path(outdir);
 			}

diff --git a/src/sdatxtract.cpp b/src/sdatxtract.cpp
@@ -103,7 +103,7 @@ SdatX::~SdatX()
 
 bool SdatX::Write()
 {
-	std::string outfile = "sdat_file_"+std::string(fs::path(m_Filepath).stem())+".sdat";
+	std::string outfile = "sdat_file_"+std::string(fs::path(m_Filepath).stem().string())+".sdat";
 	printf("Outputting to file %s\n", outfile.c_str());
 
 	std::ofstream ofs(outfile, std::ofstream::binary);
@@ -127,7 +127,7 @@ bool SdatX::Extract()
 
 	int numSSEQ = 0, numSTRM = 0, numSWAR = 0, numSBNK = 0;
 
-	std::string outdir = fs::path(m_Filepath).stem();
+	std::string outdir = fs::path(m_Filepath).stem().string();
 	printf("Outputting to directory %s\n", outdir.c_str());
 	fs::create_directory(outdir);
 	fs::current_path(outdir);