Browse Source

Update dpf, use xvfb-run during win32/64 base build

Signed-off-by: falkTX <falktx@falktx.com>
tags/26.01
falkTX 3 months ago
parent
commit
295f0b1332
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
3 changed files with 2 additions and 16 deletions
  1. +1
    -1
      .github/workflows/build.yml
  2. +1
    -1
      dpf
  3. +0
    -14
      src/CardinalUI.cpp

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

@@ -426,7 +426,7 @@ jobs:
export PATH="/usr/lib/ccache:${PATH}"
source deps/PawPaw/local.env ${{ matrix.target }}
make features
make NOOPT=true -j $(nproc)
xvfb-run make NOOPT=true -j $(nproc)
- name: Build cross-compiled (carla)
if: steps.cache.outputs.cache-hit == 'true'
shell: bash


+ 1
- 1
dpf

@@ -1 +1 @@
Subproject commit 4238e1c7f0351bbe488d79f0899c540543ac7583
Subproject commit 2cc2280fa0d060cb137f7ab6f07f8b8b0133f3b4

+ 0
- 14
src/CardinalUI.cpp View File

@@ -1259,20 +1259,6 @@ protected:
#endif
}

#if 0
void uiReshape(const uint width, const uint height) override
{
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glMatrixMode(GL_PROJECTION);
glLoadIdentity();
glOrtho(0.0, width, 0.0, height, -1.0, 1.0);
glViewport(0, 0, width, height);
glMatrixMode(GL_MODELVIEW);
glLoadIdentity();
}
#endif

private:
/**
Set our UI class as non-copyable and add a leak detector just in case.


Loading…
Cancel
Save