Fix MacOS build

.gitignore

@@ -14,6 +14,7 @@ Makefile*
 .qmake.stash
 /.project
 *_autogen/
+*.app
 /bin/templates/Player.exe
 /bin/*.app
 /bin/*.dll
@@ -27,6 +28,7 @@ Makefile*
 /bin/*.res
 /bin/platforms
 *.cbp
+Testing
 
 # flatpak
 /.flatpak-builder

README.adoc

@@ -61,7 +61,7 @@ Step-by-step instructions:
 [source,shell]
 ---------------------------------------
 cmake .        # generate Makefile
-cmake --build  # compile the executable
+cmake --build . # compile the executable
 ---------------------------------------
 
 

src/common/dbstring.h

@@ -25,7 +25,7 @@ inline QString ToQString(const std::string& s) {
 	return QString::fromStdString(s);
 }
 
-inline QString ToQString(lcf::StringView s) {
+inline QString ToQString(std::string_view s) {
 	return QString::fromUtf8(s.data(), s.size());
 }
 

src/model/event_command_list.cpp

@@ -15,6 +15,7 @@
  * along with EasyRPG Editor. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <cassert>
 #include "event_command_list.h"
 
 EventCommandList::EventCommandList(std::vector<lcf::rpg::EventCommand>& commands, int current_index) :

src/model/project.cpp

@@ -67,13 +67,15 @@ std::shared_ptr<Project> Project::load(const QDir& dir) {
 		cfg = FileFinder::Find(dir, RM_INI);
 	}
 
+	std::string title;
+	std::string enc;
 	if (!cfg.isNull()) {
-		lcf::INIReader ini(cfg.toStdString());
-		std::string title = ini.GetString("RPG_RT", GAMETITLE, tr("Untitled").toStdString());
+		const lcf::INIReader ini(cfg.toStdString());
+		title = ini.GetString("RPG_RT", GAMETITLE, tr("Untitled").toStdString());
 
 		if (project_type == FileFinder::ProjectType::Legacy) {
 			// Check for game encoding
-			std::string enc = ini.GetString("EasyRPG", "Encoding", "");
+			enc = ini.GetString("EasyRPG", "Encoding", "");
 			if (enc.empty()) {
 				// Only use the title for encoding detection
 				// This is called for all games in the "Open Project" list