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

Whoopsie, let's not clobber LDFLAGS now

Browse Source
This commit is contained in:
Ben "root" Anderson
2014-02-09 22:13:51 -06:00
parent 233be07097
commit 6a2d052e30
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
configure.ac
+1 -1
View File
@@ -118,7 +118,7 @@ dnl NOTE: This won't be hardcoded "yes" later when we implement --with-license
CFLAGS="$CFLAGS -I$PWD/bundle/ffmpeg" CFLAGS="$CFLAGS -I$PWD/bundle/ffmpeg"
CXXFLAGS="$CXXFLAGS -I$PWD/bundle/ffmpeg" CXXFLAGS="$CXXFLAGS -I$PWD/bundle/ffmpeg"
dnl Make the binary find our bundled libs dnl Make the binary find our bundled libs
LDFLAGS="-Wl,-rpath=bundle/ffmpeg/libavutil,-rpath=bundle/ffmpeg/libavformat,-rpath=bundle/ffmpeg/libavcodec,-rpath=bundle/ffmpeg/libswscale" LDFLAGS="$LDFLAGS -Wl,-rpath=bundle/ffmpeg/libavutil,-rpath=bundle/ffmpeg/libavformat,-rpath=bundle/ffmpeg/libavcodec,-rpath=bundle/ffmpeg/libswscale"
dnl Classic autoconf. This CANNOT be broken across multiple lines. dnl Classic autoconf. This CANNOT be broken across multiple lines.
FFMPEG_LIBS="-L$PWD/bundle/ffmpeg/libavutil -lavutil -L$PWD/bundle/ffmpeg/libavformat -lavformat -L$PWD/bundle/ffmpeg/libavcodec -lavcodec -L$PWD/bundle/ffmpeg/libswscale -lswscale" FFMPEG_LIBS="-L$PWD/bundle/ffmpeg/libavutil -lavutil -L$PWD/bundle/ffmpeg/libavformat -lavformat -L$PWD/bundle/ffmpeg/libavcodec -lavcodec -L$PWD/bundle/ffmpeg/libswscale -lswscale"
fi fi