joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-10-13 17:48:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove --enable-avcodec from build scripts, fix FFMPEG detection, do not link to avcodec or include avcodec headers if not detected

Browse Source
This commit is contained in:
Jonathan Campbell
2020-06-03 10:22:01 -07:00
parent 51a7023cd8
commit f351754bf3
9 changed files with 9 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build
View File

@@ -19,6 +19,6 @@ echo Compiling our internal SDLnet 1.x
# now compile ourself
echo Compiling DOSBox-X
chmod +x configure
./configure --enable-core-inline --disable-debug --enable-avcodec --prefix=/usr "$@" || exit 1
./configure --enable-core-inline --disable-debug --prefix=/usr "$@" || exit 1
make -j3 || exit 1

2
build-debug
View File

@@ -37,6 +37,6 @@ echo Compiling our internal SDLnet 1.x
# now compile ourself
echo Compiling DOSBox-X
chmod +x configure
./configure --enable-core-inline --enable-debug=heavy --enable-avcodec --prefix=/usr "$@" $opt || exit 1
./configure --enable-core-inline --enable-debug=heavy --prefix=/usr "$@" $opt || exit 1
make -j3 || exit 1

32
build-debug-no-avcodec
View File

@@ -1,32 +0,0 @@
#!/bin/bash
# allow 32-bit on 64-bit (x86) builds
if [ "$1" == "32" ]; then
export CC=`which gcc`" -m32"
export CXX=`which g++`" -m32"
shift
opt="--host=i686-pc-linux-gnu --target=i686-pc-linux-gnu"
fi
# I'm sick and tired of all the churn the three versions of autoconf
# are causing in this repo. Stop committing the configure scripts
# and just autoregen.
./autogen.sh || exit 1
# fix
chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh
# prefer to compile against our own copy of SDL 1.x
echo Compiling our internal SDL 1.x
(cd vs2015/sdl && ./build-dosbox.sh) || exit 1
# prefer to compile against our own copy of SDLnet 1.x
echo Compiling our internal SDLnet 1.x
(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1
# now compile ourself
echo Compiling DOSBox-X
chmod +x configure
./configure --enable-core-inline --enable-debug=heavy --disable-avcodec --prefix=/usr "$@" $opt || exit 1
make -j3 || exit 1

2
build-debug-no-mt32
View File

@@ -26,6 +26,6 @@ echo Compiling our internal SDLnet 1.x
# now compile ourself
echo Compiling DOSBox-X
chmod +x configure
./configure --enable-core-inline --enable-debug=heavy --enable-avcodec --prefix=/usr --disable-mt32 "$@" || exit 1
./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --disable-mt32 "$@" || exit 1
make -j3 || exit 1

2
build-debug-sdl2
View File

@@ -33,6 +33,6 @@ echo Compiling our internal SDLnet 1.x
(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1
chmod +x configure
./configure --enable-core-inline --enable-debug=heavy --enable-avcodec --prefix=/usr --enable-sdl2 "$@" $opt || exit 1
./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --enable-sdl2 "$@" $opt || exit 1
make -j3 || exit 1

2
build-macosx
View File

@@ -45,6 +45,6 @@ export CXXFLAGS="$new$CXXFLAGS"
# now compile ourself
echo Compiling DOSBox-X
chmod +x configure
./configure --enable-core-inline --enable-debug=heavy --prefix=/usr "$@" || exit 1 # --enable-avcodec
./configure --enable-core-inline --enable-debug=heavy --prefix=/usr "$@" || exit 1
make -j3 || exit 1

2
build-macosx-sdl2
View File

@@ -42,6 +42,6 @@ export CXXFLAGS="$new$CXXFLAGS"
# now compile ourself
echo Compiling DOSBox-X
chmod +x configure
./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --enable-sdl2 "$@" || exit 1 # --enable-avcodec
./configure --enable-core-inline --enable-debug=heavy --prefix=/usr --enable-sdl2 "$@" || exit 1
make -j3 || exit 1

24
build-no-avcodec
View File

@@ -1,24 +0,0 @@
#!/bin/bash
# I'm sick and tired of all the churn the three versions of autoconf
# are causing in this repo. Stop committing the configure scripts
# and just autoregen.
./autogen.sh || exit 1
# fix
chmod +x vs2015/sdl/build-scripts/strip_fPIC.sh
# prefer to compile against our own copy of SDL 1.x
echo Compiling our internal SDL 1.x
(cd vs2015/sdl && ./build-dosbox.sh) || exit 1
# prefer to compile against our own copy of SDLnet 1.x
echo Compiling our internal SDLnet 1.x
(cd vs2015/sdlnet && ./build-dosbox.sh) || exit 1
# now compile ourself
echo Compiling DOSBox-X
chmod +x configure
./configure --enable-core-inline --disable-debug --prefix=/usr "$@" || exit 1
make -j3 || exit 1

8
configure.ac
View File

@@ -947,14 +947,12 @@ fi
dnl FEATURE: FFMPEG output support
AH_TEMPLATE(C_AVCODEC,[Define to 1 to use FFMPEG libavcodec for video capture])
AC_ARG_ENABLE(avcodec,AC_HELP_STRING([--disable-avcodec],[Disable FFMPEG avcodec support]),,enable_ffmpeg=yes)
if test x$enable_avcodec = xyes; then
CFLAGS="$CFLAGS "`pkg-config libavcodec --cflags`
CPPFLAGS="$CPPFLAGS "`pkg-config libavcodec --cflags`
LIBS="$LIBS -lavcodec -lavformat -lavutil -lswscale "`pkg-config libavcodec --libs`
fi
if test x$enable_avcodec = xyes; then
if test x$have_ffmpeg = xyes; then
if test x$have_avcodec_h = xyes; then
CFLAGS="$CFLAGS "`pkg-config libavcodec --cflags`
CPPFLAGS="$CPPFLAGS "`pkg-config libavcodec --cflags`
LIBS="$LIBS -lavcodec -lavformat -lavutil -lswscale "`pkg-config libavcodec --libs`
AC_MSG_RESULT(yes)
AC_DEFINE(C_AVCODEC,1)
fi