From 814089783524cfe737953ca6363b08180ca0c27d Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Mon, 14 Oct 2019 01:08:36 -0400 Subject: [PATCH] Don't include GLFW/glfw3native.h in window.hpp. --- include/rack.hpp | 4 +++- include/window.hpp | 8 -------- src/main.cpp | 6 ++++++ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/rack.hpp b/include/rack.hpp index 814ca8ec..d590dbaa 100644 --- a/include/rack.hpp +++ b/include/rack.hpp @@ -1,6 +1,8 @@ #pragma once -// Include most Rack headers for convenience + +// The following headers are the "public" API of Rack. + #include #include #include diff --git a/include/window.hpp b/include/window.hpp index bdd7eb0f..acb5b1ea 100644 --- a/include/window.hpp +++ b/include/window.hpp @@ -8,14 +8,6 @@ #define GLEW_NO_GLU #include #include -#if defined ARCH_WIN - #define GLFW_EXPOSE_NATIVE_WIN32 -#elif defined ARCH_MAC - #define GLFW_EXPOSE_NATIVE_COCOA -#elif defined ARCH_LIN - #define GLFW_EXPOSE_NATIVE_X11 -#endif -#include #include #define NANOVG_GL2 #include diff --git a/src/main.cpp b/src/main.cpp index f08ac23f..7d1ec764 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -27,6 +27,12 @@ #include // for CreateMutex #endif +#if defined ARCH_MAC + #define GLFW_EXPOSE_NATIVE_COCOA + #include // for glfwGetOpenedFilenames() +#endif + + using namespace rack;