joncampbell123/dosbox-x
1
0
Fork 0
mirror of https://github.com/joncampbell123/dosbox-x.git synced 2025-05-09 20:01:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5308 from maron2000/fix_linuxbuild

Browse Source 
Fix --disable-screenshots option (configure.ac)
This commit is contained in:
Jonathan Campbell 2024-12-10 13:43:46 -08:00 committed by GitHub
commit 2c4014a68f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/linux.yml vendored
View File

@ -25,7 +25,7 @@ jobs:
- name: Build minimal - name: Build minimal
run: | run: |
echo "timestamp=`git show -s --format=%at | xargs -I# date -d @# +%Y%m%d%H%M%S`" >> $GITHUB_ENV echo "timestamp=`git show -s --format=%at | xargs -I# date -d @# +%Y%m%d%H%M%S`" >> $GITHUB_ENV
./build --disable-freetype --disable-libfluidsynth --disable-mt32 ./build --disable-freetype --disable-libfluidsynth --disable-mt32 --disable-screenshots
- name: Install libraries - name: Install libraries
run: | run: |
sudo apt-get update -y sudo apt-get update -y

16
configure.ac
View File

@ -1098,17 +1098,17 @@ AH_TEMPLATE(C_LIBPNG,[Define to 1 if you have libpng])
AH_TEMPLATE(C_SSHOT,[Define to 1 to enable screenshots, requires libpng]) AH_TEMPLATE(C_SSHOT,[Define to 1 to enable screenshots, requires libpng])
AC_ARG_ENABLE(screenshots,AC_HELP_STRING([--disable-screenshots],[Disable screenshots and movie recording]),,enable_screenshots=yes) AC_ARG_ENABLE(screenshots,AC_HELP_STRING([--disable-screenshots],[Disable screenshots and movie recording]),,enable_screenshots=yes)
AC_MSG_CHECKING([whether screenshots will be enabled]) AC_MSG_CHECKING([whether screenshots will be enabled])
if test x$enable_screenshots = xyes; then if test x$have_png_lib = xyes -a x$have_png_h = xyes ; then
if test x$have_png_lib = xyes -a x$have_png_h = xyes ; then
LIBS="$LIBS -lpng -lz" LIBS="$LIBS -lpng -lz"
AC_DEFINE(C_LIBPNG,1) AC_DEFINE(C_LIBPNG,1)
AC_DEFINE(C_SSHOT,1) if test x$enable_screenshots = xyes; then
AC_MSG_RESULT([yes]) AC_DEFINE(C_SSHOT,1)
else AC_MSG_RESULT([yes])
AC_MSG_RESULT([no, can't find libpng.]) else
fi AC_MSG_RESULT([no])
fi
else else
AC_MSG_RESULT([no]) AC_MSG_ERROR([Can't find libpng, install or try building the in-tree code])
fi fi
dnl FEATURE: Whether to use libpcap, and enable ethernet pass-through dnl FEATURE: Whether to use libpcap, and enable ethernet pass-through