mirror of
https://github.com/obsproject/obs-studio.git
synced 2024-07-01 00:53:31 +00:00
cmake,plugins,build-aux: Remove enc-amf
This commit is contained in:
parent
2f5038318e
commit
edf2c8210c
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -1,9 +1,6 @@
|
||||||
[submodule "plugins/win-dshow/libdshowcapture"]
|
[submodule "plugins/win-dshow/libdshowcapture"]
|
||||||
path = plugins/win-dshow/libdshowcapture
|
path = plugins/win-dshow/libdshowcapture
|
||||||
url = https://github.com/obsproject/libdshowcapture.git
|
url = https://github.com/obsproject/libdshowcapture.git
|
||||||
[submodule "plugins/enc-amf"]
|
|
||||||
path = plugins/enc-amf
|
|
||||||
url = https://github.com/obsproject/obs-amd-encoder.git
|
|
||||||
[submodule "plugins/obs-browser"]
|
[submodule "plugins/obs-browser"]
|
||||||
path = plugins/obs-browser
|
path = plugins/obs-browser
|
||||||
url = https://github.com/obsproject/obs-browser.git
|
url = https://github.com/obsproject/obs-browser.git
|
||||||
|
|
|
@ -51,7 +51,7 @@ invoke_formatter() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local -a source_files=((libobs|libobs-*|UI|plugins|deps)/**/*.(c|cpp|h|hpp|m|mm)(.N))
|
local -a source_files=((libobs|libobs-*|UI|plugins|deps)/**/*.(c|cpp|h|hpp|m|mm)(.N))
|
||||||
source_files=(${source_files:#*/(obs-websocket/deps|decklink/*/decklink-sdk|enc-amf|mac-syphon/syphon-framework|obs-outputs/ftl-sdk|win-dshow/libdshowcapture)/*})
|
source_files=(${source_files:#*/(obs-websocket/deps|decklink/*/decklink-sdk|mac-syphon/syphon-framework|obs-outputs/ftl-sdk|win-dshow/libdshowcapture)/*})
|
||||||
|
|
||||||
local -a format_args=(-style=file -fallback-style=none)
|
local -a format_args=(-style=file -fallback-style=none)
|
||||||
if (( _loglevel > 2 )) format_args+=(--verbose)
|
if (( _loglevel > 2 )) format_args+=(--verbose)
|
||||||
|
@ -71,7 +71,7 @@ invoke_formatter() {
|
||||||
}
|
}
|
||||||
|
|
||||||
local -a source_files=((libobs|libobs-*|UI|plugins|deps|cmake)/**/(CMakeLists.txt|*.cmake)(.N))
|
local -a source_files=((libobs|libobs-*|UI|plugins|deps|cmake)/**/(CMakeLists.txt|*.cmake)(.N))
|
||||||
source_files=(${source_files:#*/(obs-outputs/ftl-sdk|jansson|decklink/*/decklink-sdk|enc-amf|obs-websocket|obs-browser|win-dshow/libdshowcapture)/*})
|
source_files=(${source_files:#*/(obs-outputs/ftl-sdk|jansson|decklink/*/decklink-sdk|obs-websocket|obs-browser|win-dshow/libdshowcapture)/*})
|
||||||
|
|
||||||
local -a format_args=()
|
local -a format_args=()
|
||||||
if (( _loglevel > 2 )) format_args+=(--log-level debug)
|
if (( _loglevel > 2 )) format_args+=(--log-level debug)
|
||||||
|
|
|
@ -34,8 +34,6 @@ function(set_target_properties_obs target)
|
||||||
# cmake-format: off
|
# cmake-format: off
|
||||||
_target_install_obs(${target} DESTINATION ${OBS_EXECUTABLE_DESTINATION} 32BIT)
|
_target_install_obs(${target} DESTINATION ${OBS_EXECUTABLE_DESTINATION} 32BIT)
|
||||||
# cmake-format: on
|
# cmake-format: on
|
||||||
elseif(target STREQUAL enc-amf-test)
|
|
||||||
set(OBS_EXECUTABLE_DESTINATION "${OBS_DATA_DESTINATION}/obs-plugins/enc-amf")
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# cmake-format: off
|
# cmake-format: off
|
||||||
|
|
|
@ -43,9 +43,6 @@ if(OBS_CMAKE_VERSION VERSION_GREATER_EQUAL 3.0.0)
|
||||||
OR OS_LINUX)
|
OR OS_LINUX)
|
||||||
add_subdirectory(decklink)
|
add_subdirectory(decklink)
|
||||||
endif()
|
endif()
|
||||||
if(OS_WINDOWS)
|
|
||||||
add_subdirectory(enc-amf)
|
|
||||||
endif()
|
|
||||||
add_subdirectory(image-source)
|
add_subdirectory(image-source)
|
||||||
if(OS_LINUX)
|
if(OS_LINUX)
|
||||||
add_subdirectory(linux-alsa)
|
add_subdirectory(linux-alsa)
|
||||||
|
@ -122,12 +119,6 @@ if(OS_WINDOWS)
|
||||||
add_subdirectory(vlc-video)
|
add_subdirectory(vlc-video)
|
||||||
add_subdirectory(obs-vst)
|
add_subdirectory(obs-vst)
|
||||||
|
|
||||||
if(EXISTS "${CMAKE_CURRENT_LIST_DIR}/enc-amf/CMakeLists.txt")
|
|
||||||
add_subdirectory(enc-amf)
|
|
||||||
else()
|
|
||||||
obs_status(WARNING "enc-amf plugin not found.")
|
|
||||||
endif()
|
|
||||||
|
|
||||||
check_obs_browser()
|
check_obs_browser()
|
||||||
elseif(OS_MACOS)
|
elseif(OS_MACOS)
|
||||||
add_subdirectory(coreaudio-encoder)
|
add_subdirectory(coreaudio-encoder)
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit ffb00ec1c0772ada05330e4856a9e8f278e7677f
|
|
Loading…
Reference in a new issue