forked from mia/Aegisub
vapoursynth: Add Mac support
This commit is contained in:
parent
178551071e
commit
3d278547fe
3 changed files with 11 additions and 6 deletions
4
.github/workflows/ci.yml
vendored
4
.github/workflows/ci.yml
vendored
|
@ -53,13 +53,13 @@ jobs:
|
|||
name: macOS Debug,
|
||||
os: macos-latest,
|
||||
buildtype: debugoptimized,
|
||||
args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true
|
||||
args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true -Dvapoursynth=enabled
|
||||
}
|
||||
- {
|
||||
name: macOS Release,
|
||||
os: macos-latest,
|
||||
buildtype: release,
|
||||
args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true
|
||||
args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true -Dvapoursynth=enabled
|
||||
}
|
||||
|
||||
steps:
|
||||
|
|
|
@ -26,8 +26,6 @@
|
|||
|
||||
#include "options.h"
|
||||
|
||||
#include <mutex>
|
||||
|
||||
#ifndef _WIN32
|
||||
#include <dlfcn.h>
|
||||
#endif
|
||||
|
@ -35,7 +33,13 @@
|
|||
#ifdef _WIN32
|
||||
#define VSSCRIPT_SO "vsscript.dll"
|
||||
#else
|
||||
#ifdef __APPLE__
|
||||
#define VSSCRIPT_SO "libvapoursynth-script.dylib"
|
||||
#define DLOPEN_FLAGS RTLD_LAZY | RTLD_GLOBAL
|
||||
#else
|
||||
#define VSSCRIPT_SO "libvapoursynth-script.so"
|
||||
#define DLOPEN_FLAGS RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// Allocate storage for and initialise static members
|
||||
|
@ -63,7 +67,7 @@ VapourSynthWrapper::VapourSynthWrapper() {
|
|||
#undef _Lstr
|
||||
#undef CONCATENATE
|
||||
#else
|
||||
hLib = dlopen(VSSCRIPT_SO, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND);
|
||||
hLib = dlopen(VSSCRIPT_SO, DLOPEN_FLAGS);
|
||||
#endif
|
||||
|
||||
if (!hLib)
|
||||
|
|
|
@ -21,13 +21,14 @@
|
|||
|
||||
#ifdef WITH_VAPOURSYNTH
|
||||
|
||||
#include <mutex>
|
||||
|
||||
#include <libaegisub/exception.h>
|
||||
|
||||
DEFINE_EXCEPTION(VapourSynthError, agi::Exception);
|
||||
|
||||
struct VSAPI;
|
||||
struct VSSCRIPTAPI;
|
||||
namespace std { class mutex; }
|
||||
|
||||
class VapourSynthWrapper {
|
||||
VapourSynthWrapper(VapourSynthWrapper const&);
|
||||
|
|
Loading…
Reference in a new issue