-

Author: codenamecpp

Makefile

@@ -0,0 +1,33 @@
+CPUS := $(shell nproc)
+
+all: build_debug
+	true
+
+build_debug: premake
+	.build/premake5 gmake --cc=clang
+	make -C .build config=debug_x86_64 -j$(CPUS)
+	test -d bin || mkdir bin
+	cp .build/bin/x86_64/Debug/glkeeper bin/glkeeper-debug
+
+build_release: premake
+	.build/premake5 gmake --cc=clang
+	make -C .build config=release_x86_64 -j$(CPUS)
+	test -d bin || mkdir bin
+	cp .build/bin/x86_64/Release/glkeeper bin/glkeeper-release
+
+clean:
+	.build/premake5 gmake --cc=clang
+	make -C third_party/Box2D/Build clean
+	make -C .build clean
+
+run:
+	./bin/glkeeper-debug -gamedir ../games/dk2
+
+builddir: 
+	test -d .build || mkdir .build
+
+premake: builddir
+	test -e .build/premake5 || (cd .build && \
+	wget https://github.com/premake/premake-core/releases/download/v5.0.0-alpha14/premake-5.0.0-alpha14-linux.tar.gz && \
+	tar xzf premake-5.0.0-alpha14-linux.tar.gz && \
+	rm premake-5.0.0-alpha14-linux.tar.gz)

premake5.lua

@@ -0,0 +1,80 @@
+workspace "glkeeper"
+   location '.build'
+   configurations { "Debug", "Release" }
+   cppdialect 'C++17'
+
+configuration { "linux", "gmake" }
+buildoptions { "-Wno-switch" }
+
+filter 'system:linux'
+   platforms { 'x86_64' }
+
+project "GLFW"
+	kind "StaticLib"
+   	language "C"
+	files 
+	{ 
+		"src/GLFW/internal.h",
+		"src/GLFWglfw_config.h",
+		"src/GLFW/glfw3.h",
+		"src/GLFW/glfw3native.h",
+		"src/GLFW/context.c",
+		"src/GLFW/init.c",
+		"src/GLFW/input.c",
+		"src/GLFW/monitor.c",
+		"src/GLFW/vulkan.c",
+		"src/GLFW/window.c",
+    		"src/GLFW/x11_platform.h",
+		"src/GLFW/xkb_unicode.h",
+		"src/GLFW/linux_joystick.h",
+		"src/GLFW/posix_time.h",
+		"src/GLFW/glx_context.h",
+		"src/GLFW/egl_context.h",
+		"src/GLFW/x11_init.c",
+		"src/GLFW/x11_monitor.c",
+		"src/GLFW/x11_window.c",
+		"src/GLFW/glx_context.h",
+		"src/GLFW/glx_context.c",
+		"src/GLFW/glext.h",
+		"src/GLFW/xkb_unicode.c",
+		"src/GLFW/linux_joystick.c",
+		"src/GLFW/posix_time.c",
+		"src/GLFW/glx_context.c",
+		"src/GLFW/egl_context.c",
+		"src/GLFW/posix_thread.h",
+		"src/GLFW/posix_thread.c",
+		"src/GLFW/osmesa_context.c",
+		"src/GLFW/osmesa_context.h"
+	}
+	includedirs { "GLFW" }
+	links { "GL", "GLEW", "stdc++fs", "X11", "Xrandr", "Xinerama", "Xcursor", "pthread", "dl" }
+
+	filter { "configurations:Debug" }
+		defines { "DEBUG", "_DEBUG" }
+		symbols "On"
+
+	filter { "configurations:Release" }
+		defines { "NDEBUG" }
+		optimize "On"
+
+project "glkeeper"
+	kind "WindowedApp"
+   	language "C++"
+	files 
+	{ 
+		"src/*.h", 
+		"src/*.cpp",
+		"src/3rd_party/*.h",
+		"src/3rd_party/*.cpp"
+	}
+	includedirs { "src" }
+	includedirs { "GLFW" }
+	links { "GL", "GLEW", "stdc++fs", "X11", "Xrandr", "Xinerama", "Xcursor", "pthread", "dl", "GLFW" }
+
+	filter { "configurations:Debug" }
+		defines { "DEBUG", "_DEBUG" }
+		symbols "On"
+
+	filter { "configurations:Release" }
+		defines { "NDEBUG" }
+		optimize "On"

src/GameMain.cpp

@@ -33,7 +33,7 @@ bool GameMain::Initialize()
 
     // set initial gamestate
     //SwitchToGameState(&mMeshViewGamestate);
-    gGameWorld.LoadScenario("devmap");
+    gGameWorld.LoadScenario("null");
     SwitchToGameState(&mGameplayGamestate);
 
     //SwitchToGameState(&mGuiTestGamestate);

src/ScenarioLoader.cpp

@@ -1639,7 +1639,7 @@ bool ScenarioLoader::LoadScenarioData(const std::string& scenario)
             gConsole.LogMessage(eLogMessage_Warning, "Cannot locate scenario data file '%s'", pathEntry.mFilePath.c_str());
             continue;   
         }
-        if (!ReadDataFile(fileStream, pathEntry.mId))
+        if (!ReadDataFile(dataFileStream, pathEntry.mId))
         {
             gConsole.LogMessage(eLogMessage_Warning, "Error reading scenario data file '%s'", pathEntry.mFilePath.c_str());
             return false;