actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1009 from rfkrocktk/feature/ffmpeg-pic

Browse Source 
Compile FFMPEG in PIC when configured as such.
This commit is contained in:
Jason Felds
2016-02-12 16:35:22 -05:00
parent 9fe6f49a55 203189a98c
commit 132fd8ed55
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMake/SetupFfmpeg.cmake
+4
View File
@@ -22,6 +22,10 @@ list(APPEND FFMPEG_CONFIGURE
"--enable-static" "--enable-static"
) )
if(CMAKE_POSITION_INDEPENDENT_CODE)
list(APPEND FFMPEG_CONFIGURE "--enable-pic")
endif()
if(MACOSX) if(MACOSX)
# TODO: Remove these two items when Mac OS X StepMania builds in 64-bit. # TODO: Remove these two items when Mac OS X StepMania builds in 64-bit.
list(APPEND FFMPEG_CONFIGURE list(APPEND FFMPEG_CONFIGURE