OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-06-30 08:33:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

obs-scripting: Update Linux slice for CMake build framework 3.0

Browse source
This commit is contained in:
PatTheMav 2024-04-13 20:06:44 +02:00 committed by Ryan Foster
parent 1f911dd0d0
commit e87a5c3691
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
deps/obs-scripting/CMakeLists.txt vendored
View file

@ -50,5 +50,9 @@ if(OS_WINDOWS)
endif()
# cmake-format: off
set_target_properties_obs(obs-scripting PROPERTIES FOLDER scripting PREFIX "")
set_target_properties_obs(obs-scripting PROPERTIES FOLDER scripting)
if (OS_WINDOWS OR OS_MACOS)
set_property(TARGET obs-scripting PROPERTY PREFIX "")
endif()
# cmake-format: on

7
deps/obs-scripting/obs-scripting-python.c vendored
View file

@ -1750,6 +1750,13 @@ bool obs_scripting_load_python(const char *python_path)
}
dstr_free(&resource_path);
#else
char *relative_script_path =
os_get_executable_path_ptr("../" SCRIPT_DIR);
if (relative_script_path) {
add_to_python_path(relative_script_path);
}
bfree(relative_script_path);
char *absolute_script_path = os_get_abs_path_ptr(SCRIPT_DIR);
add_to_python_path(absolute_script_path);
bfree(absolute_script_path);

2
deps/obs-scripting/obspython/CMakeLists.txt vendored
View file

@ -43,7 +43,7 @@ target_compile_options(
obspython
PRIVATE $<$<PLATFORM_ID:Windows>:/wd4100>
$<$<PLATFORM_ID:Windows>:/wd4197>
$<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang>:-Wno-unused-parameter>
$<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang,GNU>:-Wno-unused-parameter>
$<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang>:-Wno-macro-redefined>
$<$<COMPILE_LANG_AND_ID:C,AppleClang,Clang>:-Wno-unreachable-code>)