Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ include(compilerconfig)
include(defaults)
include(helpers)

option(ENABLE_UI "Enable building with UI (requires Qt)" ON)
option(ENABLE_SCRIPTING "Enable scripting support" ON)
option(ENABLE_HEVC "Enable HEVC encoders" ON)

Expand Down
4 changes: 2 additions & 2 deletions shared/obs-scripting/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ target_sources(

target_compile_definitions(
obs-scripting
PRIVATE SCRIPT_DIR="${OBS_SCRIPT_PLUGIN_PATH}" $<$<BOOL:${ENABLE_UI}>:ENABLE_UI>
PRIVATE SCRIPT_DIR="${OBS_SCRIPT_PLUGIN_PATH}" $<$<BOOL:${ENABLE_FRONTEND}>:ENABLE_UI>
)

target_include_directories(obs-scripting PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
Expand All @@ -40,7 +40,7 @@ target_link_libraries(
PRIVATE
OBS::libobs
OBS::cstrcache
$<$<BOOL:${ENABLE_UI}>:OBS::frontend-api>
$<$<BOOL:${ENABLE_FRONTEND}>:OBS::frontend-api>
$<$<PLATFORM_ID:Windows>:OBS::w32-pthreads>
$<$<PLATFORM_ID:Darwin>:objc>
)
Expand Down
2 changes: 1 addition & 1 deletion shared/obs-scripting/cmake/lua.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ if(ENABLE_SCRIPTING_LUA)
target_sources(
obs-scripting
PRIVATE
$<$<BOOL:${ENABLE_UI}>:obs-scripting-lua-frontend.c>
$<$<BOOL:${ENABLE_FRONTEND}>:obs-scripting-lua-frontend.c>
obs-scripting-lua-source.c
obs-scripting-lua.c
obs-scripting-lua.h
Expand Down
2 changes: 1 addition & 1 deletion shared/obs-scripting/cmake/python.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ if(ENABLE_SCRIPTING_PYTHON)
target_sources(
obs-scripting
PRIVATE
$<$<BOOL:${ENABLE_UI}>:obs-scripting-python-frontend.c>
$<$<BOOL:${ENABLE_FRONTEND}>:obs-scripting-python-frontend.c>
$<$<PLATFORM_ID:Windows,Darwin>:obs-scripting-python-import.c>
obs-scripting-python-import.h
obs-scripting-python.c
Expand Down
2 changes: 1 addition & 1 deletion shared/obs-scripting/obs-scripting-config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
#define SCRIPT_DIR "@OBS_SCRIPT_PLUGIN_PATH@"
#define PYTHON_LIB "@OBS_SCRIPT_PYTHON_PATH@"

#define UI_ENABLED @ENABLE_UI@
#define UI_ENABLED @ENABLE_FRONTEND@
6 changes: 3 additions & 3 deletions shared/obs-scripting/obslua/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@ target_compile_options(

target_compile_definitions(
obslua
PRIVATE SWIG_TYPE_TABLE=obslua SWIG_LUA_INTERPRETER_NO_DEBUG $<$<BOOL:${ENABLE_UI}>:ENABLE_UI>
PRIVATE SWIG_TYPE_TABLE=obslua SWIG_LUA_INTERPRETER_NO_DEBUG $<$<BOOL:${ENABLE_FRONTEND}>:ENABLE_UI>
)

target_link_libraries(
obslua
PRIVATE OBS::cstrcache OBS::libobs OBS::scripting Luajit::Luajit $<$<BOOL:${ENABLE_UI}>:OBS::frontend-api>
PRIVATE OBS::cstrcache OBS::libobs OBS::scripting Luajit::Luajit $<$<BOOL:${ENABLE_FRONTEND}>:OBS::frontend-api>
)

set_property(
Expand All @@ -48,7 +48,7 @@ set_property(
SWIG_COMPILE_DEFINITIONS
"SWIG_TYPE_TABLE=obslua"
"SWIG_LUA_INTERPRETER_NO_DEBUG"
"$<$<BOOL:${ENABLE_UI}>:ENABLE_UI>"
"$<$<BOOL:${ENABLE_FRONTEND}>:ENABLE_UI>"
)

set_target_properties_obs(obslua PROPERTIES FOLDER scripting XCODE_ATTRIBUTE_STRIP_STYLE non-global)
6 changes: 3 additions & 3 deletions shared/obs-scripting/obspython/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ target_compile_definitions(
SWIG_TYPE_TABLE=obspython
Py_ENABLE_SHARED=1
SWIG_PYTHON_INTERPRETER_NO_DEBUG
$<$<BOOL:${ENABLE_UI}>:ENABLE_UI>
$<$<BOOL:${ENABLE_FRONTEND}>:ENABLE_UI>
)

target_link_libraries(
Expand All @@ -68,7 +68,7 @@ target_link_libraries(
OBS::cstrcache
OBS::libobs
OBS::scripting
$<$<BOOL:${ENABLE_UI}>:OBS::frontend-api>
$<$<BOOL:${ENABLE_FRONTEND}>:OBS::frontend-api>
$<$<NOT:$<PLATFORM_ID:Darwin>>:Python::Python>
)

Expand All @@ -93,7 +93,7 @@ set_property(
"SWIG_TYPE_TABLE=obspython"
"Py_ENABLE_SHARED=1"
"SWIG_PYTHON_INTERPRETER_NO_DEBUG"
"$<$<BOOL:${ENABLE_UI}>:ENABLE_UI>"
"$<$<BOOL:${ENABLE_FRONTEND}>:ENABLE_UI>"
"$<$<PLATFORM_ID:Windows>:MS_NO_COREDLL>"
)

Expand Down