Add configure.ac option to force SDL drawn menus, even if the host OS provides menus

This commit is contained in:
Jonathan Campbell
2018-05-15 23:26:48 -07:00
parent a7367af6c6
commit fe62c29c4a
3 changed files with 31 additions and 1 deletions

21
build-mingw-sdldraw Normal file
View File

@@ -0,0 +1,21 @@
#!/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
# now compile ourself
echo Compiling DOSBox-X
chmod +x configure
# FIXME: I would like MinGW builds to enable the debugger, eventually
./configure --enable-core-inline --enable-force-menu-sdldraw --prefix=/usr || exit 1
make -j3 || exit 1

View File

@@ -135,6 +135,10 @@ if test x$warn_cpp0x = x1; then
AC_MSG_ERROR([ Your compiler must support C++11 or better ]) AC_MSG_ERROR([ Your compiler must support C++11 or better ])
fi fi
dnl Yksoft1 wants a MinGW build for Windows that doesn't use the Windows menu system.
AH_TEMPLATE(C_FORCE_MENU_SDLDRAW,[Define to 1 to force SDL-drawn menus])
AC_ARG_ENABLE(force-menu-sdldraw,AC_HELP_STRING([--enable-force-menu-sdldraw],[Force SDL drawn menus]),enable_force_menu_sdldraw=yes)
dnl This is how the build script can specify a HX DOS extender target dnl This is how the build script can specify a HX DOS extender target
AH_TEMPLATE(C_HX_DOS,[Define to 1 to target HX DOS]) AH_TEMPLATE(C_HX_DOS,[Define to 1 to target HX DOS])
AC_ARG_ENABLE(hx-dos,AC_HELP_STRING([--enable-hx-dos],[Enable HX target]),enable_hx=yes) AC_ARG_ENABLE(hx-dos,AC_HELP_STRING([--enable-hx-dos],[Enable HX target]),enable_hx=yes)
@@ -149,6 +153,11 @@ case "$host" in
;; ;;
esac esac
if test x$enable_force_menu_sdldraw == xyes; then
CXXFLAGS="$CXXFLAGS -DFORCE_SDLDRAW"
AC_DEFINE(C_FORCE_MENU_SDLDRAW,1,[Force SDL drawn menus])
fi
dnl TEST: Environ can be included dnl TEST: Environ can be included
AC_MSG_CHECKING(if environ can be included) AC_MSG_CHECKING(if environ can be included)
AC_LINK_IFELSE([AC_LANG_PROGRAM([[ AC_LINK_IFELSE([AC_LANG_PROGRAM([[

View File

@@ -1,3 +1,3 @@
/*auto-generated*/ /*auto-generated*/
#define UPDATED_STR "May 14, 2018 10:46:43pm" #define UPDATED_STR "May 15, 2018 11:26:22pm"
#define COPYRIGHT_END_YEAR "2018" #define COPYRIGHT_END_YEAR "2018"