mirror/obs-studio
0
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-09-20 04:42:18 +02:00
Code

Add relative plugin dest obsconfig.h define

Browse Source
This commit is contained in:
BtbN 2014-07-21 17:43:48 +02:00
parent cac6ad1822
commit 0b7ef499c5
3 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmake/Modules/ObsHelpers.cmake
View File

@ -45,6 +45,7 @@ if(NOT UNIX_STRUCTURE)
set(OBS_DATA_PATH "../${OBS_DATA_DESTINATION}")
set(OBS_INSTALL_PREFIX "")
set(OBS_RELATIVE_PLUGIN_DEST "../${OBS_PLUGIN_DESTINATION}")
else()
set(OBS_EXECUTABLE_DESTINATION "bin/${_lib_suffix}bit")
set(OBS_EXECUTABLE32_DESTINATION "bin/32bit")
@ -58,6 +59,7 @@ if(NOT UNIX_STRUCTURE)
set(OBS_DATA_PATH "../../${OBS_DATA_DESTINATION}")
set(OBS_INSTALL_PREFIX "")
set(OBS_RELATIVE_PLUGIN_DEST "../../${OBS_PLUGIN_DESTINATION}")
endif()
set(OBS_CMAKE_DESTINATION "cmake")
set(OBS_INCLUDE_DESTINATION "include")
@ -77,6 +79,7 @@ else()
set(OBS_DATA_PATH "${OBS_DATA_DESTINATION}")
set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/")
set(OBS_RELATIVE_PLUGIN_DEST "../${OBS_PLUGIN_DESTINATION}")
endif()
function(obs_finish_bundle)

1
libobs/obs-config.h
View File

@ -59,6 +59,7 @@
# define OBS_VERSION "unknown"
# define OBS_DATA_PATH "../../data"
# define OBS_INSTALL_PREFIX ""
# define OBS_RELATIVE_PLUGIN_DEST "../../obs-plugins"
#endif
#define OBS_INSTALL_DATA_PATH OBS_INSTALL_PREFIX OBS_DATA_PATH

1
libobs/obsconfig.h.in
View File

@ -4,3 +4,4 @@
#define OBS_VERSION "@OBS_VERSION@"
#define OBS_DATA_PATH "@OBS_DATA_PATH@"
#define OBS_INSTALL_PREFIX "@OBS_INSTALL_PREFIX@"
#define OBS_RELATIVE_PLUGIN_DEST "@OBS_RELATIVE_PLUGIN_DEST@"