From a2035b7b69ce01961f93a56e53f1f5e20839df10 Mon Sep 17 00:00:00 2001 From: falkTX Date: Tue, 26 Oct 2021 18:56:02 +0100 Subject: [PATCH] Stop using osdialog altogether; Fix macOS file->open action --- dpf | 2 +- src/Makefile | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dpf b/dpf index 2d1ec00..62996d5 160000 --- a/dpf +++ b/dpf @@ -1 +1 @@ -Subproject commit 2d1ec00e27c7ac2f5f1fc84ebaacf0a49b220502 +Subproject commit 62996d5578702fde52e309528d6a4a894a7b3997 diff --git a/src/Makefile b/src/Makefile index 35f398b..1679091 100644 --- a/src/Makefile +++ b/src/Makefile @@ -26,11 +26,11 @@ FILES_DSP = \ override/context.cpp \ override/dep.cpp \ override/library.cpp \ - override/network.cpp + override/network.cpp \ + override/osdialog.cpp ifeq ($(HEADLESS),true) FILES_DSP += \ - override/osdialog.cpp \ override/RemoteNanoVG.cpp \ override/RemoteWindow.cpp else @@ -54,15 +54,6 @@ FILES_DSP += Rack/dep/pffft/fftpack.c FILES_DSP += Rack/dep/osdialog/osdialog.c FILES_DSP += Rack/dep/oui-blendish/blendish.c -# FIXME dont use this -ifeq ($(MACOS),true) -FILES_UI += Rack/dep/osdialog/osdialog_mac.m -else ifeq ($(WINDOWS),true) -FILES_UI += Rack/dep/osdialog/osdialog_win.c -else -FILES_UI += Rack/dep/osdialog/osdialog_zenity.c -endif - IGNORED_FILES = Rack/src/asset.cpp IGNORED_FILES += Rack/src/common.cpp IGNORED_FILES += Rack/src/context.cpp