build: bundle render worker/backends and fix concurrent param test
- Make olive-editor depend on olive-render-worker on all platforms so the worker is always built with the main app. - Copy olive-render-worker and dynamic render backends (oakgl, oakvulkan) into the macOS app bundle next to the executable. - Include oakgl.dll and oakvulkan.dll in the Windows NSIS installer. - Fix PluginSmokeThread.ConcurrentParamAccess CI failure by adding a mutex around IntegerInstance's no-node fallback storage and serializing the test's set/get pair. - Hide the render worker's Dock icon on macOS via NSApplicationActivationPolicyProhibited.
This commit is contained in:
@@ -51,6 +51,10 @@
|
||||
#include "render/colorprocessor.h"
|
||||
#include "render/colortransform.h"
|
||||
|
||||
#ifdef Q_OS_MACOS
|
||||
void HideWorkerDockIcon();
|
||||
#endif
|
||||
|
||||
namespace
|
||||
{
|
||||
|
||||
@@ -520,6 +524,11 @@ int main(int argc, char *argv[])
|
||||
InstallSurfaceFormat();
|
||||
|
||||
QGuiApplication app(argc, argv);
|
||||
|
||||
#ifdef Q_OS_MACOS
|
||||
HideWorkerDockIcon();
|
||||
#endif
|
||||
|
||||
QCoreApplication::setOrganizationName(QStringLiteral("oakvideoeditor.org"));
|
||||
QCoreApplication::setApplicationName(QStringLiteral("olive-render-worker"));
|
||||
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
/***
|
||||
|
||||
Oak - Non-Linear Video Editor
|
||||
Copyright (C) 2026 Oak Team
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
***/
|
||||
|
||||
#include <Cocoa/Cocoa.h>
|
||||
|
||||
void HideWorkerDockIcon()
|
||||
{
|
||||
[NSApp setActivationPolicy:NSApplicationActivationPolicyProhibited];
|
||||
}
|
||||
Reference in New Issue
Block a user