diff options
| author | John Stebbins <[email protected]> | 2019-04-06 08:09:10 -0600 |
|---|---|---|
| committer | John Stebbins <[email protected]> | 2019-04-06 08:09:10 -0600 |
| commit | 2b49ecaa889e72bdce73a20d0729aacee8b9ab03 (patch) | |
| tree | 2c6b14644a8440ee225e54ae97c436770f612663 /gtk | |
| parent | 525de85e68b87d5fe4bcac68a711166446a99cf8 (diff) | |
LinGui: put libnuma after libx265 in link command
Ubuntu fails to link when numa is listed before x265. Fedora somehow
fixes the order, libtool (evil) magic.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/configure.ac | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/gtk/configure.ac b/gtk/configure.ac index 6e8c896e3..c27be12e2 100644 --- a/gtk/configure.ac +++ b/gtk/configure.ac @@ -181,6 +181,18 @@ GHB_CFLAGS="$HBINC $GHB_CFLAGS" HB_LIBS="-lhandbrake -lavformat -lavfilter -lavcodec -lavutil -lswresample -lpostproc -ldvdnav -ldvdread -lmp3lame -lvorbis -lvorbisenc -logg -lsamplerate -lx264 -lswscale -ltheoraenc -ltheoradec -lvpx -lz -lbz2 -lbluray -lass -lfontconfig -lfreetype -lxml2 -ljansson -lopus -lspeex -llzma" +if test "x$use_fdk_aac" = "xyes" ; then + HB_LIBS="$HB_LIBS -lfdk-aac" +fi + +if test "x$use_x265" = "xyes" ; then + HB_LIBS="$HB_LIBS -lx265 -lnuma" +fi + +if test "x$use_qsv" = "xyes" ; then + HB_LIBS="$HB_LIBS -lmfx -lva -lva-drm" +fi + case $host in *-*-mingw*) if test "x$use_libdl" = "xyes" ; then @@ -197,23 +209,12 @@ case $host in HB_LIBS="$HB_LIBS -lpthread" ;; *) - HB_LIBS="$HB_LIBS -ldl -lpthread -lnuma" + HB_LIBS="$HB_LIBS -ldl -lpthread" ;; esac AM_CONDITIONAL([GHB_FLATPAK], [test "$use_flatpak" = "yes"]) -if test "x$use_fdk_aac" = "xyes" ; then - HB_LIBS="$HB_LIBS -lfdk-aac" -fi - -if test "x$use_x265" = "xyes" ; then - HB_LIBS="$HB_LIBS -lx265" -fi - -if test "x$use_qsv" = "xyes" ; then - HB_LIBS="$HB_LIBS -lmfx -lva -lva-drm" -fi if test "x$PYTHON" != "x" ; then HB_PYTHON="$PYTHON" else |