diff --git a/2dGameProject/SpriteRenderer.cpp b/2dGameProject/SpriteRenderer.cpp index 8d0946d..5698be0 100644 --- a/2dGameProject/SpriteRenderer.cpp +++ b/2dGameProject/SpriteRenderer.cpp @@ -1,6 +1,5 @@ #include "SpriteRenderer.h" #include -#include #include #include "Log.h" diff --git a/2dGameProject/Square.cpp b/2dGameProject/Square.cpp index 4c483dc..9449b86 100644 --- a/2dGameProject/Square.cpp +++ b/2dGameProject/Square.cpp @@ -2,7 +2,6 @@ #include #include #include -#include "deff.h" Square::Square(glm::vec3 position, glm::vec3 scale, glm::vec4 color) { //Initialize Member Variables diff --git a/2dGameProject/Window.cpp b/2dGameProject/Window.cpp index 19139cd..456256c 100644 --- a/2dGameProject/Window.cpp +++ b/2dGameProject/Window.cpp @@ -1,5 +1,4 @@ #include "Window.h" -#include #include "Log.h" Window::Window(int width, int height, const char* title) { @@ -69,7 +68,7 @@ void Window::setFullscreen(int width, int height, int refreshRate, GLFWmonitor* void Window::setWindowed() { is_fullscreen = false; - glfwSetWindowMonitor(glfw_window, NULL, windowed_mode_x, windowed_mode_y, width, height, NULL); + glfwSetWindowMonitor(glfw_window, NULL, windowed_mode_x, windowed_mode_y, width, height, 0); } void Window::setWindowedFullscreen() { diff --git a/2dGameProject/main.cpp b/2dGameProject/main.cpp index 5ad6057..82b74ed 100644 --- a/2dGameProject/main.cpp +++ b/2dGameProject/main.cpp @@ -1,5 +1,4 @@ #define GLFW_INCLUDE_NONE -#include #include #include "Window.h" #include @@ -9,8 +8,6 @@ #include #include #include -#include -#include #include "Square.h" #include "deff.h" #include diff --git a/CMakeLists.txt b/CMakeLists.txt index 92d6900..22afde5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,6 +4,7 @@ file(GLOB 2dGameProject_SRC "2dGameProject/*.h" "2dGameProject/*.cpp" ) +set(OpenGL_GL_PREFERENCE GLVND) find_package(OpenGL REQUIRED) add_subdirectory(deps/glfw) add_subdirectory(deps/glad)