Fixed Windows build errors

MihailRis · Nov 12, 2023 · 7fe2a05 · 7fe2a05
1 parent 55538d3
commit 7fe2a05
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -2,7 +2,6 @@
 #include "Window.h"
 #include "Events.h"
 
-#define GLEW_STATIC
 #include <GL/glew.h>
 #include <GLFW/glfw3.h>