diff --git a/include/simpleengine/event/event.h b/include/simpleengine/event/event.h index 9f24cdf..ca86fcf 100644 --- a/include/simpleengine/event/event.h +++ b/include/simpleengine/event/event.h @@ -9,12 +9,12 @@ namespace simpleengine { class Event : public simpleengine::Destructable { public: - explicit Event(std::shared_ptr window = nullptr) : window(window) {} + explicit Event(GLFWwindow* window = nullptr) : window(window) {} virtual ~Event() = default; virtual void update(const float& delta_time) = 0; - virtual void render(std::shared_ptr target) = 0; + virtual void render(GLFWwindow* target) = 0; protected: - std::shared_ptr window; + GLFWwindow* window; }; } \ No newline at end of file diff --git a/include/simpleengine/game.h b/include/simpleengine/game.h index 6830123..b09b105 100644 --- a/include/simpleengine/game.h +++ b/include/simpleengine/game.h @@ -4,7 +4,12 @@ #include #include +#ifdef __linux__ +#include +#elif #include +#endif + #include #include "event/event.h" @@ -35,14 +40,14 @@ namespace simpleengine { int run(); //void AddEvent(Event* event); - std::shared_ptr get_window(); + GLFWwindow* get_window(); private: static void framebuffer_resize_callback(GLFWwindow*, int fbW, int fbH); void initialize(const int& gl_profile, const int& major_version, const int& minor_version, const bool& resizeable, const int& forward_compat = GL_TRUE); - std::shared_ptr window; + GLFWwindow* window; std::vector> events; const bool& window_resizeable; }; diff --git a/include/simpleengine/gfx/shader.h b/include/simpleengine/gfx/shader.h index 75bae66..135c6b1 100644 --- a/include/simpleengine/gfx/shader.h +++ b/include/simpleengine/gfx/shader.h @@ -1,8 +1,14 @@ #pragma once #include + +#ifdef __linux__ +#include +#include +#elif #include #include +#endif #include diff --git a/include/simpleengine/gfx/texture.h b/include/simpleengine/gfx/texture.h index f467cdd..527a35e 100644 --- a/include/simpleengine/gfx/texture.h +++ b/include/simpleengine/gfx/texture.h @@ -1,7 +1,12 @@ #pragma once +#ifdef __linux__ +#include +#include +#elif #include #include +#endif #include