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

libobs: Silence clang warnings for empty prototypes without void

Browse source 
clang expects an empty prototype to explicitly use `void`.

Also silences the warning in `libobs-opengl`, `obsglad`, `caption`,
`mac-syphon` and `obs-x264-test`.
This commit is contained in:
PatTheMav 2023-04-06 01:09:50 +02:00 committed by Ryan Foster
parent 5ca17aa25f
commit 3ca56fee84
5 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
deps/glad/CMakeLists.txt vendored
View file

@ -17,6 +17,8 @@ target_link_libraries(obsglad PUBLIC OpenGL::GL)
if(OS_WINDOWS)
target_sources(obsglad PRIVATE src/glad_wgl.c include/glad/glad_wgl.h)
elseif(OS_MACOS)
target_compile_options(obsglad PRIVATE -Wno-strict-prototypes)
elseif(OS_LINUX OR OS_FREEBSD)
if(TARGET OpenGL::EGL)
target_sources(obsglad PRIVATE src/glad_egl.c include/EGL/eglplatform.h include/glad/glad_egl.h)

4
deps/libcaption/CMakeLists.txt vendored
View file

@ -25,7 +25,9 @@ target_sources(
target_compile_definitions(caption PRIVATE __STDC_CONSTANT_MACROS $<$<CXX_COMPILER_ID:MSVC>:_CRT_SECURE_NO_WARNINGS>)
target_compile_options(caption PRIVATE $<$<CXX_COMPILER_ID:Clang,AppleClang,GNU>:-Wno-unused-but-set-parameter>)
target_compile_options(
caption
PRIVATE "$<$<CXX_COMPILER_ID:Clang,AppleClang,GNU>:-Wno-unused-but-set-parameter;-Wno-comma;-Wno-strict-prototypes>")
target_include_directories(
caption

1
libobs-opengl/CMakeLists.txt
View file

@ -38,6 +38,7 @@ elseif(OS_MACOS)
target_sources(libobs-opengl PRIVATE gl-cocoa.m)
target_compile_definitions(libobs-opengl PRIVATE GL_SILENCE_DEPRECATION)
target_compile_options(libobs-opengl PRIVATE -Wno-strict-prototypes)
target_link_libraries(libobs-opengl PRIVATE ${COCOA} ${IOSURF})
elseif(OS_LINUX OR OS_FREEBSD)

2
libobs/cmake/os-macos.cmake
View file

@ -39,5 +39,7 @@ target_sources(
util/threading-posix.h
util/apple/cfstring-utils.h)
target_compile_options(libobs PUBLIC -Wno-strict-prototypes)
set_property(SOURCE util/platform-cocoa.m obs-cocoa.m PROPERTY COMPILE_FLAGS -fobjc-arc)
set_property(TARGET libobs PROPERTY FRAMEWORK TRUE)

4
plugins/obs-x264/cmake/x264-test.cmake
View file

@ -6,3 +6,7 @@ target_link_libraries(obs-x264-test PRIVATE OBS::opts-parser)
add_test(NAME obs-x264-test COMMAND obs-x264-test)
set_target_properties(obs-x264-test PROPERTIES FOLDER plugins/obs-x264)
if(OS_MACOS)
target_compile_options(obs-x264-test PRIVATE -Wno-strict-prototypes)
endif()