brian/Cardinal
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Stop using network

Browse source
This commit is contained in:
falkTX 2021-10-08 11:21:57 +01:00
parent 0845a0ffa2
commit 59bc0f7fc9
4 changed files with 19 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/Cardinal/CardinalUI.cpp
View file

@ -19,6 +19,7 @@
#include <app/Scene.hpp> #include <app/Scene.hpp>
#include <context.hpp> #include <context.hpp>
#include <engine/Engine.hpp> #include <engine/Engine.hpp>
#include <network.hpp>
#include <patch.hpp> #include <patch.hpp>
#include <ui/common.hpp> #include <ui/common.hpp>
#include <window/Window.hpp> #include <window/Window.hpp>
@ -31,6 +32,14 @@ GLFWAPI void glfwSetClipboardString(GLFWwindow* window, const char*) {}
GLFWAPI const char* glfwGetKeyName(int key, int scancode) { return nullptr; } GLFWAPI const char* glfwGetKeyName(int key, int scancode) { return nullptr; }
GLFWAPI int glfwGetKeyScancode(int key) { return 0; } 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 rack {
namespace window { namespace window {
DISTRHO_NAMESPACE::UI* lastUI = nullptr; DISTRHO_NAMESPACE::UI* lastUI = nullptr;

13
plugins/Cardinal/Makefile
View file

@ -47,15 +47,11 @@ endif
FILES_DSP += $(wildcard Rack/src/*.c) FILES_DSP += $(wildcard Rack/src/*.c)
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)) 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/libjansson.a
EXTRA_LIBS += Rack/dep/lib/libspeexdsp.a EXTRA_LIBS += Rack/dep/lib/libspeexdsp.a
EXTRA_LIBS += Rack/dep/lib/libssl.a
EXTRA_LIBS += Rack/dep/lib/libzstd.a EXTRA_LIBS += Rack/dep/lib/libzstd.a
ifeq ($(WINDOWS),true) ifeq ($(WINDOWS),true)
@ -77,9 +73,15 @@ else
CMAKE := cmake CMAKE := cmake
endif endif
BUILD_C_FLAGS += -std=gnu11
Rack/dep/lib/%.a: Rack/dep/lib/%.a:
$(MAKE) CMAKE="$(CMAKE) -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_INSTALL_PREFIX='$(abspath Rack/dep)'" -C 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 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/include
BASE_FLAGS += -IRack/dep/filesystem/include BASE_FLAGS += -IRack/dep/filesystem/include
BASE_FLAGS += -IRack/dep/fuzzysearchdatabase/src 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/deps
BASE_FLAGS += -IRack/dep/glfw/include BASE_FLAGS += -IRack/dep/glfw/include
BASE_FLAGS += -IRack/dep/nanovg/src BASE_FLAGS += -IRack/dep/nanovg/src

4
plugins/Cardinal/ResizeHandle.hpp
View file

@ -57,8 +57,8 @@ protected:
const double lineWidth = 1.0 * getScaleFactor(); const double lineWidth = 1.0 * getScaleFactor();
#ifdef DGL_OPENGL #ifdef DGL_OPENGL
glUseProgram(0); // glUseProgram(0);
glMatrixMode(GL_MODELVIEW); // glMatrixMode(GL_MODELVIEW);
#endif #endif
// draw white lines, 1px wide // draw white lines, 1px wide

1
plugins/Cardinal/mingw-std-threads

@ -1 +0,0 @@
Subproject commit f6365f900fb9b1cd6014c8d1cf13ceacf8faf3de