Преглед на файлове

Add relative plugin dest obsconfig.h define

BtbN преди 11 години
родител
ревизия
0b7ef499c5
променени са 3 файла, в които са добавени 5 реда и са изтрити 0 реда
  1. 3 0
      cmake/Modules/ObsHelpers.cmake
  2. 1 0
      libobs/obs-config.h
  3. 1 0
      libobs/obsconfig.h.in

+ 3 - 0
cmake/Modules/ObsHelpers.cmake

@@ -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 - 0
libobs/obs-config.h

@@ -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 - 0
libobs/obsconfig.h.in

@@ -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@"