More FFMpeg adjustments

Since many distros don't have packages for FFMpeg 0.10 yet, allow a static
prebuilt package to be specifiec with --with-static-ffmpeg=/path/to/ffmpeg.

Also recreate the functionality of ./Utils/build.sh to now pull FFMpeg 0.10.2
from the web, statically build it, and link it into Stepmania.
This commit is contained in:
Austen Dicken
2012-03-30 18:05:58 -05:00
parent c0b4389846
commit df32fc663d
3 changed files with 63 additions and 17 deletions
+7 -4
View File
@@ -601,7 +601,9 @@ libtomcrypt_a_CPPFLAGS = -I$(srcdir)/libtomcrypt/src/headers $(AM_CPPFLAGS)
noinst_LIBRARIES += libtomcrypt.a
main_CPPFLAGS = -I$(top_srcdir)/extern/jsoncpp/include
main_CPPFLAGS = \
$(VIDEO_CFLAGS) \
-I$(top_srcdir)/extern/jsoncpp/include
#-I$(top_srcdir)/extern/glew-1.5.8/include
main_SOURCES = $(PNG) \
@@ -618,9 +620,10 @@ main_SOURCES = $(PNG) \
$(GlobalSingletons)
main_LDADD = \
$(AUDIO_LIBS) \
$(XLIBS) \
libtomcrypt.a libtommath.a
$(VIDEO_LIBS) \
$(AUDIO_LIBS) \
$(XLIBS) \
libtomcrypt.a libtommath.a
nodist_stepmania_SOURCES = ver.cpp