Browse Source

Cleanup

Signed-off-by: falkTX <falktx@falktx.com>
tags/23.02
falkTX 2 years ago
parent
commit
b9279fc2b3
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 3 additions and 23 deletions
  1. +2
    -2
      .github/workflows/build.yml
  2. +1
    -21
      src/custom/RemoteNanoVG.cpp

+ 2
- 2
.github/workflows/build.yml View File

@@ -1121,7 +1121,7 @@ jobs:
WITH_LTO: false
run: |
make features
make NOOPT=true SKIP_STRIPPING=true carla deps dgl plugins resources dpf/utils/lv2_ttl_generator -j $(nproc)
make NOOPT=true SKIP_STRIPPING=true carla deps dgl plugins resources -j $(nproc)
# single job for final build stage, otherwise we might get killed due to OOM
- name: Build Cardinal (final build stage)
env:
@@ -1131,7 +1131,7 @@ jobs:
WITH_LTO: false
run: |
make features
make NOOPT=true SKIP_STRIPPING=true -C src jack lv2 vst2 vst3 clap -j 1
make NOOPT=true SKIP_STRIPPING=true -j 1
./dpf/utils/generate-ttl.sh
- name: Run Cardinal self-tests
run: |


+ 1
- 21
src/custom/RemoteNanoVG.cpp View File

@@ -20,31 +20,16 @@
#ifndef DISTRHO_PLUGIN_WANT_DIRECT_ACCESS
# error wrong build 1
#endif
#if DISTRHO_PLUGIN_WANT_DIRECT_ACCESS
#if DISTRHO_PLUGIN_WANT_DIRECT_ACCESS && !defined(HEADLESS)
# error wrong build 2
#endif

// #if ! DISTRHO_PLUGIN_WANT_DIRECT_ACCESS
// # define HEADLESS
// #endif
//
// #ifndef HEADLESS
// # include "OpenGL.hpp"
// #endif

#include "nanovg.h"

// #ifdef HEADLESS
struct NVGLUframebuffer;
void nvgluBindFramebuffer(NVGLUframebuffer* fb) {}
NVGLUframebuffer* nvgluCreateFramebuffer(NVGcontext* ctx, int w, int h, int imageFlags) { return nullptr; }
void nvgluDeleteFramebuffer(NVGLUframebuffer* fb) {}
// #else
// # define NANOVG_GLES2_IMPLEMENTATION
// # define NANOVG_FBO_VALID 1
// # include "nanovg_gl.h"
// # include "nanovg_gl_utils.h"
// #endif

#if defined(__GNUC__) && (__GNUC__ >= 6)
# pragma GCC diagnostic push
@@ -74,8 +59,3 @@ GLFWAPI int glfwGetKeyScancode(int) { return 0; }
GLFWAPI double glfwGetTime(void) { return 0.0; }

}

// #ifndef HEADLESS
// # define STB_IMAGE_WRITE_IMPLEMENTATION
// # include "../src/Rack/dep/glfw/deps/stb_image_write.h"
// #endif

Loading…
Cancel
Save