jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "mac-virtualcam: Move DAL plugin to plugin data directory"

Browse Source 
This reverts commit 4d1764036fdc05c4534468f22894baf299d24b2f.
This commit is contained in:
jp9000 2021-08-16 07:36:54 -07:00
parent 4d1764036f
commit 33130d7d15
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/mac-virtualcam/src/dal-plugin/CMakeLists.txt
View File

@ -104,6 +104,6 @@ add_custom_command(TARGET mac-dal-plugin
add_custom_command(TARGET mac-dal-plugin
POST_BUILD
COMMAND rm -rf "${OBS_OUTPUT_DIR}/$<CONFIGURATION>/data/obs-mac-virtualcam.plugin" || true
COMMAND ${CMAKE_COMMAND} -E copy_directory ${TARGET_DIR}/obs-mac-virtualcam.plugin "${OBS_OUTPUT_DIR}/$<CONFIGURATION>/data/obs-plugins/mac-virtualcam/obs-mac-virtualcam.plugin"
COMMAND ${CMAKE_COMMAND} -E copy_directory ${TARGET_DIR}/obs-mac-virtualcam.plugin "${OBS_OUTPUT_DIR}/$<CONFIGURATION>/data/obs-mac-virtualcam.plugin"
COMMENT "Copy plugin to destination"
)

4
plugins/mac-virtualcam/src/obs-plugin/plugin-main.mm
View File

@ -58,7 +58,7 @@ static bool check_dal_plugin()
if ([app bundleIdentifier] != nil) {
NSURL *bundleURL = [app bundleURL];
NSString *pluginPath =
@"Contents/Resources/data/obs-plugins/mac-virtualcam/obs-mac-virtualcam.plugin";
@"Contents/Resources/data/obs-mac-virtualcam.plugin";
NSURL *pluginUrl = [bundleURL
URLByAppendingPathComponent:pluginPath];
@ -66,7 +66,7 @@ static bool check_dal_plugin()
} else {
dalPluginSourcePath = [[[[app executableURL]
URLByAppendingPathComponent:
@"../data/obs-plugins/mac-virtualcam/obs-mac-virtualcam.plugin"]
@"../data/obs-mac-virtualcam.plugin"]
path]
stringByReplacingOccurrencesOfString:@"obs/"
withString:@""];