diff --git a/plugins/Cardinal/CardinalUI.cpp b/plugins/Cardinal/CardinalUI.cpp index a00c846..375586f 100644 --- a/plugins/Cardinal/CardinalUI.cpp +++ b/plugins/Cardinal/CardinalUI.cpp @@ -19,6 +19,7 @@ #include #include #include +#include #include #include #include @@ -31,6 +32,14 @@ GLFWAPI void glfwSetClipboardString(GLFWwindow* window, const char*) {} GLFWAPI const char* glfwGetKeyName(int key, int scancode) { return nullptr; } GLFWAPI int glfwGetKeyScancode(int key) { return 0; } +namespace rack { +namespace network { + std::string encodeUrl(const std::string&) { return {}; } + json_t* requestJson(Method, const std::string&, json_t*, const CookieMap&) { return nullptr; } + bool requestDownload(const std::string&, const std::string&, float*, const CookieMap&) { return nullptr; } +} +} + namespace rack { namespace window { DISTRHO_NAMESPACE::UI* lastUI = nullptr; diff --git a/plugins/Cardinal/Makefile b/plugins/Cardinal/Makefile index bcf098c..8fd8286 100644 --- a/plugins/Cardinal/Makefile +++ b/plugins/Cardinal/Makefile @@ -47,15 +47,11 @@ endif FILES_DSP += $(wildcard Rack/src/*.c) FILES_DSP += $(wildcard Rack/src/*/*.c) -FILES_DSP += $(filter-out Rack/src/gamepad.cpp Rack/src/rtaudio.cpp Rack/src/rtmidi.cpp, $(wildcard Rack/src/*.cpp)) +FILES_DSP += $(filter-out Rack/src/discord.cpp Rack/src/gamepad.cpp Rack/src/network.cpp Rack/src/rtaudio.cpp Rack/src/rtmidi.cpp, $(wildcard Rack/src/*.cpp)) FILES_DSP += $(filter-out Rack/src/window/Window.cpp, $(wildcard Rack/src/*/*.cpp)) -EXTRA_LIBS = Rack/dep/lib/libcrypto.a -EXTRA_LIBS += Rack/dep/lib/libcurl.a -# EXTRA_LIBS += Rack/dep/lib/libglfw3.a EXTRA_LIBS += Rack/dep/lib/libjansson.a EXTRA_LIBS += Rack/dep/lib/libspeexdsp.a -EXTRA_LIBS += Rack/dep/lib/libssl.a EXTRA_LIBS += Rack/dep/lib/libzstd.a ifeq ($(WINDOWS),true) @@ -77,9 +73,15 @@ else CMAKE := cmake endif +BUILD_C_FLAGS += -std=gnu11 + Rack/dep/lib/%.a: $(MAKE) CMAKE="$(CMAKE) -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_PREFIX='$(abspath Rack/dep)'" -C Rack/dep lib/$*.a +Rack/dep/lib/libarchive.a: Rack/dep/lib/libzstd.a + +Rack/dep/lib/libarchive_static.a: Rack/dep/lib/libzstd.a + Rack/dep/lib/libcrypto.a: Rack/dep/lib/libssl.a # -------------------------------------------------------------- @@ -91,6 +93,7 @@ BASE_FLAGS += -IRack/include BASE_FLAGS += -IRack/dep/include BASE_FLAGS += -IRack/dep/filesystem/include BASE_FLAGS += -IRack/dep/fuzzysearchdatabase/src +BASE_FLAGS += -IRack/dep/glew-2.1.0/include BASE_FLAGS += -IRack/dep/glfw/deps BASE_FLAGS += -IRack/dep/glfw/include BASE_FLAGS += -IRack/dep/nanovg/src diff --git a/plugins/Cardinal/ResizeHandle.hpp b/plugins/Cardinal/ResizeHandle.hpp index 237949f..da5a4f7 100644 --- a/plugins/Cardinal/ResizeHandle.hpp +++ b/plugins/Cardinal/ResizeHandle.hpp @@ -57,8 +57,8 @@ protected: const double lineWidth = 1.0 * getScaleFactor(); #ifdef DGL_OPENGL - glUseProgram(0); - glMatrixMode(GL_MODELVIEW); + // glUseProgram(0); + // glMatrixMode(GL_MODELVIEW); #endif // draw white lines, 1px wide diff --git a/plugins/Cardinal/mingw-std-threads b/plugins/Cardinal/mingw-std-threads deleted file mode 160000 index f6365f9..0000000 --- a/plugins/Cardinal/mingw-std-threads +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f6365f900fb9b1cd6014c8d1cf13ceacf8faf3de