xaymar/obs-ffmpeg-encoder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 14 Wiki Activity

cmake: Fix ffmpeg search path

Browse Source
This commit is contained in:
Michael Fabian 'Xaymar' Dirks
2018-11-24 13:04:27 +01:00
parent 5e67430006
commit 3f5f8a501b
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+2 -2
View File
@@ -184,7 +184,7 @@ endif()
# Load OBS Studio # Load OBS Studio
if(${PropertyPrefix}OBS_NATIVE) if(${PropertyPrefix}OBS_NATIVE)
Option(BUILD_FFMPEG_ENCODER "Build AMD Encoder module" ON) option(BUILD_FFMPEG_ENCODER "Build AMD Encoder module" ON)
if (NOT BUILD_FFMPEG_ENCODER) if (NOT BUILD_FFMPEG_ENCODER)
message(STATUS "Not building AMD Encoder") message(STATUS "Not building AMD Encoder")
return() return()
@@ -212,7 +212,7 @@ download_project(
URL "https://ffmpeg.zeranoe.com/builds/win${BITS}/dev/ffmpeg-4.1-win${BITS}-dev.zip" URL "https://ffmpeg.zeranoe.com/builds/win${BITS}/dev/ffmpeg-4.1-win${BITS}-dev.zip"
UPDATE_DISCONNECTED 1 UPDATE_DISCONNECTED 1
) )
set(FFmpegPath "${ffmpeg_SOURCE_DIR}/ffmpeg-4.1-win${BITS}-dev/") set(FFmpegPath "${ffmpeg_SOURCE_DIR}/")
if (WIN32) if (WIN32)
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO") set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO") set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /SAFESEH:NO")