diff --git a/CMakeLists.txt b/CMakeLists.txt index 4af6f90b753486..b6373bf937352e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/shared/obs-scripting/CMakeLists.txt b/shared/obs-scripting/CMakeLists.txt index c609c257b395e7..1513bbfb1426fb 100644 --- a/shared/obs-scripting/CMakeLists.txt +++ b/shared/obs-scripting/CMakeLists.txt @@ -30,7 +30,7 @@ target_sources( target_compile_definitions( obs-scripting - PRIVATE SCRIPT_DIR="${OBS_SCRIPT_PLUGIN_PATH}" $<$:ENABLE_UI> + PRIVATE SCRIPT_DIR="${OBS_SCRIPT_PLUGIN_PATH}" $<$:ENABLE_UI> ) target_include_directories(obs-scripting PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") @@ -40,7 +40,7 @@ target_link_libraries( PRIVATE OBS::libobs OBS::cstrcache - $<$:OBS::frontend-api> + $<$:OBS::frontend-api> $<$:OBS::w32-pthreads> $<$:objc> ) diff --git a/shared/obs-scripting/cmake/lua.cmake b/shared/obs-scripting/cmake/lua.cmake index e7e8147e2f97bb..0a67adfaead654 100644 --- a/shared/obs-scripting/cmake/lua.cmake +++ b/shared/obs-scripting/cmake/lua.cmake @@ -19,7 +19,7 @@ if(ENABLE_SCRIPTING_LUA) target_sources( obs-scripting PRIVATE - $<$:obs-scripting-lua-frontend.c> + $<$:obs-scripting-lua-frontend.c> obs-scripting-lua-source.c obs-scripting-lua.c obs-scripting-lua.h diff --git a/shared/obs-scripting/cmake/python.cmake b/shared/obs-scripting/cmake/python.cmake index 5ea5fda7793cea..cb75a3dc97b0cb 100644 --- a/shared/obs-scripting/cmake/python.cmake +++ b/shared/obs-scripting/cmake/python.cmake @@ -27,7 +27,7 @@ if(ENABLE_SCRIPTING_PYTHON) target_sources( obs-scripting PRIVATE - $<$:obs-scripting-python-frontend.c> + $<$:obs-scripting-python-frontend.c> $<$:obs-scripting-python-import.c> obs-scripting-python-import.h obs-scripting-python.c diff --git a/shared/obs-scripting/obs-scripting-config.h.in b/shared/obs-scripting/obs-scripting-config.h.in index 09bb9da0b2da87..e4e42f4fd02eab 100644 --- a/shared/obs-scripting/obs-scripting-config.h.in +++ b/shared/obs-scripting/obs-scripting-config.h.in @@ -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@ diff --git a/shared/obs-scripting/obslua/CMakeLists.txt b/shared/obs-scripting/obslua/CMakeLists.txt index 3e617f43c5e126..49cc5f0512ca80 100644 --- a/shared/obs-scripting/obslua/CMakeLists.txt +++ b/shared/obs-scripting/obslua/CMakeLists.txt @@ -33,12 +33,12 @@ target_compile_options( target_compile_definitions( obslua - PRIVATE SWIG_TYPE_TABLE=obslua SWIG_LUA_INTERPRETER_NO_DEBUG $<$:ENABLE_UI> + PRIVATE SWIG_TYPE_TABLE=obslua SWIG_LUA_INTERPRETER_NO_DEBUG $<$:ENABLE_UI> ) target_link_libraries( obslua - PRIVATE OBS::cstrcache OBS::libobs OBS::scripting Luajit::Luajit $<$:OBS::frontend-api> + PRIVATE OBS::cstrcache OBS::libobs OBS::scripting Luajit::Luajit $<$:OBS::frontend-api> ) set_property( @@ -48,7 +48,7 @@ set_property( SWIG_COMPILE_DEFINITIONS "SWIG_TYPE_TABLE=obslua" "SWIG_LUA_INTERPRETER_NO_DEBUG" - "$<$:ENABLE_UI>" + "$<$:ENABLE_UI>" ) set_target_properties_obs(obslua PROPERTIES FOLDER scripting XCODE_ATTRIBUTE_STRIP_STYLE non-global) diff --git a/shared/obs-scripting/obspython/CMakeLists.txt b/shared/obs-scripting/obspython/CMakeLists.txt index 837032f15db4da..aefacacb8b3330 100644 --- a/shared/obs-scripting/obspython/CMakeLists.txt +++ b/shared/obs-scripting/obspython/CMakeLists.txt @@ -59,7 +59,7 @@ target_compile_definitions( SWIG_TYPE_TABLE=obspython Py_ENABLE_SHARED=1 SWIG_PYTHON_INTERPRETER_NO_DEBUG - $<$:ENABLE_UI> + $<$:ENABLE_UI> ) target_link_libraries( @@ -68,7 +68,7 @@ target_link_libraries( OBS::cstrcache OBS::libobs OBS::scripting - $<$:OBS::frontend-api> + $<$:OBS::frontend-api> $<$>:Python::Python> ) @@ -93,7 +93,7 @@ set_property( "SWIG_TYPE_TABLE=obspython" "Py_ENABLE_SHARED=1" "SWIG_PYTHON_INTERPRETER_NO_DEBUG" - "$<$:ENABLE_UI>" + "$<$:ENABLE_UI>" "$<$:MS_NO_COREDLL>" )