From 7fe2a057c6f6fb3354f4a63714ca0a5000262513 Mon Sep 17 00:00:00 2001
From: MihailRis <mexaruc@gmail.com>
Date: Sun, 12 Nov 2023 05:25:32 +0300
Subject: [PATCH] Fixed Windows build errors

---
 src/coders/png.cpp     | 3 +--
 src/engine.cpp         | 1 +
 src/frontend/hud.cpp   | 4 +++-
 src/graphics/Texture.h | 1 +
 src/window/Window.cpp  | 1 -
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/coders/png.cpp b/src/coders/png.cpp
index c80930e9..9823d8a1 100644
--- a/src/coders/png.cpp
+++ b/src/coders/png.cpp
@@ -106,7 +106,7 @@ ImageData* _png_load(const char* file){
 #include <stdio.h>
 #include <inttypes.h>
 
-int _png_load(const char* file){
+ImageData* _png_load(const char* file){
 	int r = 0;
 	FILE *png;
 	char *pngbuf = nullptr;
@@ -198,7 +198,6 @@ int _png_load(const char* file){
 
     return image;
 }
-
 #endif
 
 ImageData* png::load_image(std::string filename) {
diff --git a/src/engine.cpp b/src/engine.cpp
index a2a851b0..749ddb1d 100644
--- a/src/engine.cpp
+++ b/src/engine.cpp
@@ -3,6 +3,7 @@
 #include <memory>
 #include <iostream>
 #include <glm/glm.hpp>
+#define GLEW_STATIC
 
 #include "audio/Audio.h"
 #include "assets/Assets.h"
diff --git a/src/frontend/hud.cpp b/src/frontend/hud.cpp
index 55e186c7..0d7708a0 100644
--- a/src/frontend/hud.cpp
+++ b/src/frontend/hud.cpp
@@ -76,7 +76,9 @@ HudRenderer::HudRenderer(GUI* gui, Level* level, Assets* assets) : level(level),
 		Panel* sub = new Panel(vec2(10, 27), vec4(0.0f));
 		sub->orientation(Orientation::horizontal);
 
-		Label* label = new Label(wstring({L'x'+ax})+L": ");
+		wstring str = L"x: ";
+		str[0] += ax;
+		Label* label = new Label(str);
 		label->margin(vec4(2, 3, 2, 3));
 		sub->add(shared_ptr<UINode>(label));
 		sub->color(vec4(0.0f));
diff --git a/src/graphics/Texture.h b/src/graphics/Texture.h
index 65fbf677..a01e9124 100644
--- a/src/graphics/Texture.h
+++ b/src/graphics/Texture.h
@@ -2,6 +2,7 @@
 #define GRAPHICS_TEXTURE_H_
 
 #include <string>
+#include "../typedefs.h"
 
 class ImageData;
 
diff --git a/src/window/Window.cpp b/src/window/Window.cpp
index e8c94f03..631a864c 100644
--- a/src/window/Window.cpp
+++ b/src/window/Window.cpp
@@ -2,7 +2,6 @@
 #include "Window.h"
 #include "Events.h"
 
-#define GLEW_STATIC
 #include <GL/glew.h>
 #include <GLFW/glfw3.h>