cmake: Fix native obs-studio builds

This commit is contained in:
Michael Fabian 'Xaymar' Dirks 2020-01-14 00:41:09 +01:00
parent f4f2c31495
commit 52f789436d

View file

@ -238,17 +238,19 @@ elseif(${PropertyPrefix}OBS_REFERENCE)
include("${OBS_STUDIO_DIR}/cmake/external/FindLibobs.cmake") include("${OBS_STUDIO_DIR}/cmake/external/FindLibobs.cmake")
elseif(${PropertyPrefix}OBS_DOWNLOAD) elseif(${PropertyPrefix}OBS_DOWNLOAD)
include("${libobs_SOURCE_DIR}/cmake/LibObs/LibObsConfig.cmake") include("${libobs_SOURCE_DIR}/cmake/LibObs/LibObsConfig.cmake")
else()
message(CRITICAL "Impossible case reached, verify system stability.")
return()
endif() endif()
# Load FFmpeg # Load FFmpeg
find_path( if(NOT ${PropertyPrefix}OBS_NATIVE)
find_path(
FFmpegPath "libavcodec/avcodec.h" FFmpegPath "libavcodec/avcodec.h"
HINTS HINTS
${OBS_DEPENDENCIES_DIR} ${OBS_DEPENDENCIES_DIR}
${obsdeps_SOURCE_DIR} ${obsdeps_SOURCE_DIR}
${DepsPath}
${DepsPath32}
${DepsPath64}
PATHS PATHS
/usr/include /usr/include
/usr/local/include /usr/local/include
@ -263,7 +265,8 @@ find_path(
win${ARCH}/include win${ARCH}/include
bin bin
include include
) )
endif()
find_package(FFmpeg REQUIRED COMPONENTS avutil avcodec swscale) find_package(FFmpeg REQUIRED COMPONENTS avutil avcodec swscale)
################################################################################ ################################################################################