From 079cc7025ae094bb8835e480c13679dabfbad173 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 7 May 2024 22:13:26 +0300 Subject: [PATCH 1/4] test 1 --- dev/AppImageBuilder.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/dev/AppImageBuilder.yml b/dev/AppImageBuilder.yml index 4025fa72..269197c9 100644 --- a/dev/AppImageBuilder.yml +++ b/dev/AppImageBuilder.yml @@ -26,9 +26,7 @@ AppDir: - libglew2.1 - libpng16-16 - libopenal1 - - libopengl0 - libasound2 - - libglx0 - libogg0 - libvorbis0a - libvorbisfile3 From d1b977971f44c03b7d111ec5a1f685c2dc72d02c Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 7 May 2024 22:25:05 +0300 Subject: [PATCH 2/4] args dump --- src/util/command_line.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/util/command_line.cpp b/src/util/command_line.cpp index c9751d9b..1be81839 100644 --- a/src/util/command_line.cpp +++ b/src/util/command_line.cpp @@ -32,6 +32,9 @@ bool perform_keyword(ArgsReader& reader, const std::string& keyword, EnginePaths } bool parse_cmdline(int argc, char** argv, EnginePaths& paths) { + for (int i = 0; i < argc; i++) { + std::cout << "arg " << i << "[" << argv[i] << "]" << std::endl; + } ArgsReader reader(argc, argv); reader.skip(); while (reader.hasNext()) { From 7c8591bb653cb5d0033e7f20718d43e3b63150cf Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 7 May 2024 22:32:53 +0300 Subject: [PATCH 3/4] args parser fix --- src/util/command_line.hpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/util/command_line.hpp b/src/util/command_line.hpp index 8b4ff22a..b23ea9b1 100644 --- a/src/util/command_line.hpp +++ b/src/util/command_line.hpp @@ -2,6 +2,7 @@ #define UTIL_COMMAND_LINE_HPP_ #include +#include #include #include #include "../files/engine_paths.hpp" @@ -19,7 +20,7 @@ public: } bool hasNext() const { - return pos < argc; + return pos < argc && strlen(argv[pos]); } bool isKeywordArg() const { From 097fb5c4d853f248961182c7040d80e809c6230e Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 7 May 2024 22:38:38 +0300 Subject: [PATCH 4/4] removed some test code --- src/util/command_line.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/util/command_line.cpp b/src/util/command_line.cpp index 1be81839..c9751d9b 100644 --- a/src/util/command_line.cpp +++ b/src/util/command_line.cpp @@ -32,9 +32,6 @@ bool perform_keyword(ArgsReader& reader, const std::string& keyword, EnginePaths } bool parse_cmdline(int argc, char** argv, EnginePaths& paths) { - for (int i = 0; i < argc; i++) { - std::cout << "arg " << i << "[" << argv[i] << "]" << std::endl; - } ArgsReader reader(argc, argv); reader.skip(); while (reader.hasNext()) {