Browse Source

Try enforcing -m32 for linux x86 builds

Signed-off-by: falkTX <falktx@falktx.com>
tags/22.02
falkTX 3 years ago
parent
commit
6aa4ea9799
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 7 additions and 4 deletions
  1. +4
    -1
      .github/workflows/build.yml
  2. +3
    -3
      plugins/Cardinal/CardinalPlugin.cpp

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

@@ -107,7 +107,10 @@ jobs:
env:
CC: i686-linux-gnu-gcc
CXX: i686-linux-gnu-g++
LDFLAGS: -static-libgcc -static-libstdc++
CFLAGS: -m32
CXXFLAGS: -m32
LDFLAGS: -m32 -static-libgcc -static-libstdc++
PKG_CONFIG_PATH: /usr/lib/i386-linux-gnu/pkgconfig
run: |
make features
make -j $(nproc)


+ 3
- 3
plugins/Cardinal/CardinalPlugin.cpp View File

@@ -103,7 +103,7 @@ struct Initializer {
/*
osdialog_message(OSDIALOG_ERROR, OSDIALOG_OK, message.c_str());
*/
exit(1);
// exit(1);
}
INFO("Initializing environment");
@@ -167,14 +167,14 @@ public:
fContext->event->rootWidget = fContext->scene;
fContext->patch = new rack::patch::Manager;
fContext->patch->autosavePath = "/OBVIOUSLY-NOT-VALID-PATH/";
fContext->engine->startFallbackThread();
fContext->engine->startFallbackThread();
}
~CardinalPlugin() override
{
const ScopedContext sc(this);
delete fContext;
delete fContext;
}
rack::Context* getRackContext() const noexcept


Loading…
Cancel
Save