It builds! It runs!

diff --git a/Makefile b/Makefile
index 6939f7465b99ad28b35cc00dbd0ffa008a1ea1d4..c454140a7340440a20b7b3e523423fbf3c475eec 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,7 @@ CPPFLAGS ::= -iquotesrc/ $(CPPFLAGS)
 CFLAGS ::= -g -std=c99 -Wall -Wextra -Wpedantic -Werror \
            -Wno-error=unused-function -Wno-error=unused-parameter $(CFLAGS)
 LDFLAGS ::= $(LDFLAGS)
-#LDLIBS ::= -L/usr/x86_64-w64-mingw32/lib -lopengl32 -lglew32 -lfreeglut -lassimp $(LDLIBS)
-LDLIBS ::= -lm -lopengl32 -lglew32 -lglfw -lassimp $(LDLIBS)
+LDLIBS ::= -L/usr/x86_64-w64-mingw32/bin -lm -lopengl32 -lglew32 -lglfw3 -lassimp $(LDLIBS)
 
 # ######
 # Paths

diff --git a/src/engine/engine.c b/src/engine/engine.c
index 5ebb975d37c5d05b660198f1a032c815d5e34b02..44bb884f30de1cbd9530084e29a3feeedfd29ab5 100644 (file)
--- a/src/engine/engine.c
+++ b/src/engine/engine.c
@@ -29,7 +29,7 @@ void init(EngineConfig config) {
        }
 
        logInfo("Assimp %u.%u", aiGetVersionMajor(), aiGetVersionMinor());
-       logInfo("GLEW %s", (const char*) glewGetString(GLEW_VERSION));
+//     logInfo("GLEW %s", (const char*) glewGetString(GLEW_VERSION));
        logInfo("GLFW %s", glfwGetVersionString());
 
        glfwSetErrorCallback(onGlfwError);

diff --git a/src/game/level.c b/src/game/level.c
index b9a6b5884ec16b72bceaf0bfb64b45510cc90f05..b55d55171050cfd5ee3ba33694659872e31f7092 100644 (file)
--- a/src/game/level.c
+++ b/src/game/level.c
@@ -101,7 +101,7 @@ static void buildLevelFromImage(const TgaImage* image) {
 }
 
 static inline size_t nonNegative(long n) {
-       return n < 0 ? 0u : n;
+       return n < 0 ? 0u : (size_t) n;
 }
 
 GridLocation gridLocationFromPosition(Vector pos) {