From 0af0d8e99e637bb739839ae3c9036f2fe51f0ec5 Mon Sep 17 00:00:00 2001 From: Silvio Kunaschk Date: Thu, 9 May 2019 22:50:54 +0200 Subject: [PATCH] switch from official glfw to VCVRack fork of glfw --- conanfile.txt | 4 ++++ src/main.cpp | 6 +----- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/conanfile.txt b/conanfile.txt index f0ce0dfc..d0ea4aa2 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -16,10 +16,14 @@ jansson/2.12@bincrafters/stable libcurl/7.61.1@bincrafters/stable libzip/1.5.1@bincrafters/stable +# override official glfw with VCVRack glfw version +glfw/3.3@qno/testing + #Poco/1.9.0@pocoproject/stable [generators] cmake +virtualrunenv [options] #Poco:shared=True diff --git a/src/main.cpp b/src/main.cpp index aa836b31..f02e2e34 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -148,11 +148,7 @@ int main(int argc, char *argv[]) { INFO("Initializing app"); appInit(); - // removed for now to be compliant with official GLEW version - // see https://github.com/VCVRack/Rack/issues/1269 - // https://stackoverflow.com/questions/22952536/how-do-i-pass-a-filename-from-finder-into-my-os-x-application - //const char *openedFilename = glfwGetOpenedFilename(); - const char *openedFilename = nullptr; + const char *openedFilename = glfwGetOpenedFilename(); if (openedFilename) { patchPath = openedFilename; }