Linux build fixes

README.md

@@ -59,7 +59,6 @@ sudo cmake --install build
 
 ## License ##
 [tmx2gba](https://github.com/ScrelliCopter/tmx2gba) is licensed under the [Zlib license](COPYING.txt).
-- A modified [tmxlite](https://github.com/fallahn/tmxlite) is licensed under the [Zlib license](ext/tmxlite/LICENSE).
 - [pugixml](https://pugixml.org/) is licensed under the [MIT license](ext/pugixml/LICENSE.md).
 - [René Nyffenegger's base64.cpp](https://github.com/ReneNyffenegger/cpp-base64) is licensed under the [Zlib license](ext/base64/LICENSE).
 - [miniz](https://github.com/richgel999/miniz) is licensed under the [MIT license](ext/miniz/LICENSE).

src/argparse.cpp

@@ -7,6 +7,7 @@
 #include <filesystem>
 #include <iomanip>
 #include <iostream>
+#include <algorithm>
 
 
 ArgParse::ArgParser::ArgParser(
@@ -99,19 +100,18 @@ ArgParse::ParseCtrl ArgParse::ParserState::Next(const std::string_view token)
 		{
 			flagChar = flag.value();
 			const auto opt = getOption(flagChar);
-			if (opt.has_value())
+			if (!opt.has_value())
+				return ParseCtrl::QUIT_ERR_UNKNOWN;
+			bool expect = !opt.value().get().argumentName.empty();
+			if (token.length() <= 2)
 			{
-				bool expect = !opt.value().get().argumentName.empty();
+				expectArg = expect;
-				if (token.length() <= 2)
+				if (!expectArg)
-				{
+					return handler(flagChar, "");
-					expectArg = expect;
+			}
-					if (!expectArg)
+			else
-						return handler(flagChar, "");
+			{
-				}
+				return handler(flagChar, expect ? token.substr(2) : "");
-				else
-				{
-					return handler(flagChar, expect ? token.substr(2) : "");
-				}
 			}
 		}
 		else if (!token.empty())

src/strtools.hpp

@@ -6,6 +6,7 @@
 
 #include <string>
 #include <string_view>
+#include <cstdint>
 
 // Cut leading & trailing whitespace (including newlines)
 [[nodiscard]] const std::string_view TrimWhitespace(const std::string_view str);

src/tmxreader.cpp

@@ -102,7 +102,8 @@ TmxReader::Error TmxReader::Open(const std::string& inPath,
 				});
 			}
 		}
-		mObjects.emplace(objs);
+		if (!objs.empty())
+			mObjects.emplace(objs);
 	}
 
 	return Error::OK;