libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-11-30 04:40:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

CONFIGURE: Enable building with Windows text console output

Browse Source 
Create a new flag --enable-windows-console to build with console
output on MinGW. The default behavior will be to enable the console.
The current plan is to continue to offer the users both options for
release builds - ScummVM and ScummVM (noconsole).

Whenever the text console is enabled, Windows console will be added
by default. This is to prevent a situation where ScummVM will not load
any visible debug console on hotkey or error.
This commit is contained in:
trembyle 2021-06-30 15:54:51 -04:00 committed by sluicebox
parent f8d0159328
commit 63b8d47df5
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
base/commandLine.cpp
View File

@ -71,7 +71,7 @@ static const char HELP_STRING[] =
" -z, --list-games Display list of supported games and exit\n"
" --list-all-games Display list of all detected games and exit\n"
" -t, --list-targets Display list of configured targets and exit\n"
" --list-engines Display list of suppported engines and exit\n"
" --list-engines Display list of supported engines and exit\n"
" --list-all-engines Display list of all detection engines and exit\n"
" --list-debugflags=engine Display list of engine specified debugflags\n"
" if engine=global or engine is not specified, then it will list global debugflags\n"

29
configure vendored
View File

@ -221,6 +221,7 @@ _optimization_level=
_default_optimization_level=-O2
_nuked_opl=yes
_builtin_resources=yes
_windows_console=yes
_windows_unicode=no
# Default commands
_ranlib=ranlib
@ -907,6 +908,8 @@ Optional Features:
you are doing!
--no-builtin-resources do not include additional resources (e.g. engine data, fonts)
into the ScummVM binary
--enable-windows-console show console output on Windows (default)
--disable-windows-console do not show console output on Windows
--enable-windows-unicode use Windows Unicode APIs
--disable-windows-unicode use Windows ANSI APIs (default)
@ -1379,6 +1382,12 @@ for ac_option in $@; do
--no-builtin-resources)
_builtin_resources=no
;;
--enable-windows-console)
_windows_console=yes
;;
--disable-windows-console)
_windows_console=no
;;
--enable-windows-unicode)
_windows_unicode=yes
;;
@ -5960,6 +5969,21 @@ fi
if test "$_text_console" = yes ; then
echo_n ", text console"
if test "$_windows_console" = no ; then
case "$_host_os" in
mingw*)
_windows_console=yes
;;
esac
fi
fi
if test "$_windows_console" = yes ; then
case "$_host_os" in
mingw*)
echo_n ", Windows console"
;;
esac
fi
if test "$_vkeybd" = yes ; then
@ -6037,6 +6061,11 @@ case $_host_os in
if test "$_windows_unicode" = yes; then
append_var DEFINES "-DUNICODE -D_UNICODE"
fi
# SDL2 sets -mwindows flag by default in sdl2.pc
# We need to directly replace this in the SDL pkg-config
if test "$_windows_console" = yes; then
LIBS=`echo $LIBS | sed -e 's/-mconsole//g' -e 's/-mwindows//g'`
fi
;;
riscos)
append_var CXXFLAGS "-mno-poke-function-name"