Remove BUILD_CAPTIONS build flag

This commit is contained in:
Colin Edwards
2020-11-02 22:46:55 -06:00
parent 923f06bfa6
commit 7b0d7c6357
16 changed files with 30 additions and 57 deletions

View File

@@ -81,21 +81,19 @@ if(WIN32)
auto-scene-switcher-win.cpp
frontend-tools.rc)
if(BUILD_CAPTIONS)
set(frontend-tools_PLATFORM_SOURCES
${frontend-tools_PLATFORM_SOURCES}
captions.cpp
captions-handler.cpp
captions-mssapi.cpp
captions-mssapi-stream.cpp)
set(frontend-tools_PLATFORM_HEADERS
captions.hpp
captions-handler.hpp
captions-mssapi.hpp
captions-mssapi-stream.hpp)
set(frontend-tools_PLATFORM_UI
forms/captions.ui)
endif()
set(frontend-tools_PLATFORM_SOURCES
${frontend-tools_PLATFORM_SOURCES}
captions.cpp
captions-handler.cpp
captions-mssapi.cpp
captions-mssapi-stream.cpp)
set(frontend-tools_PLATFORM_HEADERS
captions.hpp
captions-handler.hpp
captions-mssapi.hpp
captions-mssapi-stream.hpp)
set(frontend-tools_PLATFORM_UI
forms/captions.ui)
elseif(APPLE)
set(frontend-tools_PLATFORM_SOURCES
auto-scene-switcher-osx.mm)

View File

@@ -16,7 +16,6 @@
#define OFF 0
#endif
#define BUILD_CAPTIONS @BUILD_CAPTIONS@
#define ENABLE_SCRIPTING @SCRIPTING_ENABLED@
#define COMPILE_LUA @COMPILE_LUA@
#define COMPILE_PYTHON @COMPILE_PYTHON@

View File

@@ -7,7 +7,7 @@ OBS_MODULE_USE_DEFAULT_LOCALE("frontend-tools", "en-US")
void InitSceneSwitcher();
void FreeSceneSwitcher();
#if defined(_WIN32) && BUILD_CAPTIONS
#if defined(_WIN32)
void InitCaptions();
void FreeCaptions();
#endif
@@ -22,7 +22,7 @@ void FreeScripts();
bool obs_module_load(void)
{
#if defined(_WIN32) && BUILD_CAPTIONS
#if defined(_WIN32)
InitCaptions();
#endif
InitSceneSwitcher();
@@ -35,7 +35,7 @@ bool obs_module_load(void)
void obs_module_unload(void)
{
#if defined(_WIN32) && BUILD_CAPTIONS
#if defined(_WIN32)
FreeCaptions();
#endif
FreeSceneSwitcher();