Download-Tools/mkvtoolnix
1
0
Fork 0
mirror of https://gitlab.com/mbunkus/mkvtoolnix.git synced 2024-12-30 14:58:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1361 from darealshinji/patch-1

Browse Source 
Use -fPIE instead of -fPIC
This commit is contained in:
Moritz Bunkus 2015-07-20 20:54:36 +02:00
commit 9e1965197d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Rakefile
View File

@ -111,7 +111,7 @@ def setup_globals
cflags_common += " -Ilib/libebml -Ilib/libmatroska" if c?(:EBML_MATROSKA_INTERNAL) cflags_common += " -Ilib/libebml -Ilib/libmatroska" if c?(:EBML_MATROSKA_INTERNAL)
cflags_common += " #{c(:MATROSKA_CFLAGS)} #{c(:EBML_CFLAGS)} #{c(:EXTRA_CFLAGS)} #{c(:DEBUG_CFLAGS)} #{c(:PROFILING_CFLAGS)} #{c(:USER_CPPFLAGS)}" cflags_common += " #{c(:MATROSKA_CFLAGS)} #{c(:EBML_CFLAGS)} #{c(:EXTRA_CFLAGS)} #{c(:DEBUG_CFLAGS)} #{c(:PROFILING_CFLAGS)} #{c(:USER_CPPFLAGS)}"
cflags_common += " -mno-ms-bitfields -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 " if c?(:MINGW) cflags_common += " -mno-ms-bitfields -DWINVER=0x0500 -D_WIN32_WINNT=0x0500 " if c?(:MINGW)
cflags_common += " -fPIC " if c?(:USE_QT) && !c?(:MINGW) cflags_common += " -fPIE " if c?(:USE_QT) && !c?(:MINGW)
cflags_common += " -DQT_STATICPLUGIN" if c?(:USE_QT) && c?(:MINGW) cflags_common += " -DQT_STATICPLUGIN" if c?(:USE_QT) && c?(:MINGW)
cflags = "#{cflags_common} #{c(:USER_CFLAGS)}" cflags = "#{cflags_common} #{c(:USER_CFLAGS)}"