Skip to content

Commit

Permalink
Make obs-glcapture/vkcapture execute obs-gamecapture instead
Browse files Browse the repository at this point in the history
  • Loading branch information
nowrep committed Aug 25, 2022
1 parent b994604 commit 69578f2
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 30 deletions.
8 changes: 1 addition & 7 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,6 @@ target_include_directories(obs_glcapture PRIVATE $<BUILD_INTERFACE:${CMAKE_CURRE

configure_file(plugin-macros.h.in ${CMAKE_CURRENT_BINARY_DIR}/plugin-macros.h @ONLY)
configure_file(src/obs_vkcapture.json.in ${CMAKE_CURRENT_BINARY_DIR}/obs_vkcapture${LAYER_SUFFIX}.json @ONLY)
configure_file(src/obs-glcapture.in ${CMAKE_CURRENT_BINARY_DIR}/obs-glcapture @ONLY)
configure_file(src/obs-gamecapture.in ${CMAKE_CURRENT_BINARY_DIR}/obs-gamecapture @ONLY)

install(TARGETS VkLayer_obs_vkcapture
Expand All @@ -119,11 +118,6 @@ install(TARGETS obs_glcapture
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/obs_vkcapture${LAYER_SUFFIX}.json
DESTINATION "${CMAKE_INSTALL_FULL_DATAROOTDIR}/vulkan/implicit_layer.d")

install(PROGRAMS src/obs-vkcapture
DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}")

install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/obs-glcapture
DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}")

install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/obs-gamecapture
src/obs-vkcapture src/obs-glcapture
DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}")
3 changes: 3 additions & 0 deletions src/obs-glcapture
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#!/bin/sh
echo "WARNING: Please use obs-gamecapture instead."
exec obs-gamecapture "$@"
13 changes: 0 additions & 13 deletions src/obs-glcapture.in

This file was deleted.

12 changes: 2 additions & 10 deletions src/obs-vkcapture
Original file line number Diff line number Diff line change
@@ -1,11 +1,3 @@
#!/bin/sh

if [ "$#" -eq 0 ]; then
programname=`basename "$0"`
echo "ERROR: No program supplied"
echo
echo "Usage: $programname <program>"
exit 1
fi

exec env OBS_VKCAPTURE=1 "$@"
echo "WARNING: Please use obs-gamecapture instead."
exec obs-gamecapture "$@"

0 comments on commit 69578f2

Please sign in to comment.