From 92d2d6e19dbdc2328a7db8b09efa6d3aefd0ec23 Mon Sep 17 00:00:00 2001
From: Denis Sova <58488405+mks14stdio@users.noreply.github.com>
Date: Sat, 2 Dec 2023 21:39:12 +0300
Subject: [PATCH 1/3] Fix Compile

---
 src/assets/asset_loaders.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/assets/asset_loaders.cpp b/src/assets/asset_loaders.cpp
index a0020fd3..19f69c02 100644
--- a/src/assets/asset_loaders.cpp
+++ b/src/assets/asset_loaders.cpp
@@ -38,7 +38,7 @@ bool assetload::shader(Assets* assets,
     string vertexSource = files::read_string(vertexFile);
     string fragmentSource = files::read_string(fragmentFile);
 
-	Shader* shader = Shader::loadShader(vertexFile, fragmentFile,
+	Shader* shader = Shader::loadShader(vertexFile.string(), fragmentFile.string(),
                                         vertexSource, fragmentSource);
 	if (shader == nullptr) {
 		std::cerr << "failed to load shader '" << name << "'" << std::endl;

From ba5a2e3661481fd3cb13f7ca9486555cd92fdcf9 Mon Sep 17 00:00:00 2001
From: Denis Sova <58488405+mks14stdio@users.noreply.github.com>
Date: Sat, 2 Dec 2023 21:45:44 +0300
Subject: [PATCH 2/3] Lol

---
 .gitignore     | 3 +++
 .gitmodules    | 3 +++
 CMakeLists.txt | 8 +++++---
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 .gitmodules

diff --git a/.gitignore b/.gitignore
index 1dfd2a2a..28935b75 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,11 @@ Debug/src/**/*.o
 
 Debug/voxel_engine
 
+out/
 /build
 
+CMakeLists.txt
+
 /world
 /worlds/**/*
 /settings.toml
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 00000000..dd3a2140
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "libs/libspng"]
+	path = libs/libspng
+	url = https://github.com/randy408/libspng.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1bef1499..257ac227 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,10 +21,12 @@ endif()
 find_package(OpenGL REQUIRED)
 find_package(GLEW REQUIRED)
 find_package(OpenAL REQUIRED)
+find_package(GLFW3 REQUIRED)
+find_package(ZLIB REQUIRED)
 
 if (WIN32)
     set(PNGLIB spng)
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glfw)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/libspng)
 else()
     find_package(PNG REQUIRED)
     set(PNGLIB PNG::PNG)
@@ -42,6 +44,6 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 endif()
 
 
-target_link_libraries(${PROJECT_NAME} ${LIBS} glfw OpenGL::GL ${OPENAL_LIBRARY} GLEW::GLEW ${PNGLIB})
+target_link_libraries(${PROJECT_NAME} ${LIBS} glfw OpenGL::GL ${OPENAL_LIBRARY} GLEW::GLEW ${PNGLIB} spng ZLIB::ZLIB)
 
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/res DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/res DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
\ No newline at end of file

From 06256abe79f9fba3c9c10ba98d8f7ae9ddce3f88 Mon Sep 17 00:00:00 2001
From: Denis Sova <58488405+mks14stdio@users.noreply.github.com>
Date: Sat, 2 Dec 2023 21:49:49 +0300
Subject: [PATCH 3/3] Revert "Lol"

This reverts commit ba5a2e3661481fd3cb13f7ca9486555cd92fdcf9.
---
 .gitignore     | 3 ---
 .gitmodules    | 3 ---
 CMakeLists.txt | 8 +++-----
 3 files changed, 3 insertions(+), 11 deletions(-)
 delete mode 100644 .gitmodules

diff --git a/.gitignore b/.gitignore
index 28935b75..1dfd2a2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,11 +3,8 @@ Debug/src/**/*.o
 
 Debug/voxel_engine
 
-out/
 /build
 
-CMakeLists.txt
-
 /world
 /worlds/**/*
 /settings.toml
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index dd3a2140..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "libs/libspng"]
-	path = libs/libspng
-	url = https://github.com/randy408/libspng.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 257ac227..1bef1499 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,12 +21,10 @@ endif()
 find_package(OpenGL REQUIRED)
 find_package(GLEW REQUIRED)
 find_package(OpenAL REQUIRED)
-find_package(GLFW3 REQUIRED)
-find_package(ZLIB REQUIRED)
 
 if (WIN32)
     set(PNGLIB spng)
-    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/libspng)
+    add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libs/glfw)
 else()
     find_package(PNG REQUIRED)
     set(PNGLIB PNG::PNG)
@@ -44,6 +42,6 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 endif()
 
 
-target_link_libraries(${PROJECT_NAME} ${LIBS} glfw OpenGL::GL ${OPENAL_LIBRARY} GLEW::GLEW ${PNGLIB} spng ZLIB::ZLIB)
+target_link_libraries(${PROJECT_NAME} ${LIBS} glfw OpenGL::GL ${OPENAL_LIBRARY} GLEW::GLEW ${PNGLIB})
 
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/res DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
\ No newline at end of file
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/res DESTINATION ${CMAKE_CURRENT_BINARY_DIR})