Browse Source

Fix build against old glfw3

pull/8/head
falkTX 7 years ago
parent
commit
1c300584e2
1 changed files with 8 additions and 0 deletions
  1. +8
    -0
      src/gui.cpp

+ 8
- 0
src/gui.cpp View File

@@ -22,6 +22,10 @@
#include <ApplicationServices/ApplicationServices.h> #include <ApplicationServices/ApplicationServices.h>
#endif #endif


#if GLFW_VERSION_MINOR == 0 && GLFW_VERSION_REVISION <= 4
#define OLD_GLFW_VERSION
#endif

namespace rack { namespace rack {


static GLFWwindow *window = NULL; static GLFWwindow *window = NULL;
@@ -227,7 +231,9 @@ void guiInit() {
// glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2); // glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
// glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE); // glfwWindowHint(GLFW_OPENGL_FORWARD_COMPAT, GL_TRUE);
// glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE); // glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
#ifndef OLD_GLFW_VERSION
glfwWindowHint(GLFW_MAXIMIZED, GLFW_TRUE); glfwWindowHint(GLFW_MAXIMIZED, GLFW_TRUE);
#endif
std::string title = gApplicationName + " " + gApplicationVersion; std::string title = gApplicationName + " " + gApplicationVersion;
window = glfwCreateWindow(1000, 750, title.c_str(), NULL, NULL); window = glfwCreateWindow(1000, 750, title.c_str(), NULL, NULL);
assert(window); assert(window);
@@ -254,7 +260,9 @@ void guiInit() {
// GLEW generates GL error because it calls glGetString(GL_EXTENSIONS), we'll consume it here. // GLEW generates GL error because it calls glGetString(GL_EXTENSIONS), we'll consume it here.
glGetError(); glGetError();


#ifndef OLD_GLFW_VERSION
glfwSetWindowSizeLimits(window, 640, 480, GLFW_DONT_CARE, GLFW_DONT_CARE); glfwSetWindowSizeLimits(window, 640, 480, GLFW_DONT_CARE, GLFW_DONT_CARE);
#endif


// Set up NanoVG // Set up NanoVG
gVg = nvgCreateGL2(NVG_ANTIALIAS); gVg = nvgCreateGL2(NVG_ANTIALIAS);


Loading…
Cancel
Save