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

always use internal fluidsynth for mingw builds

Browse Source
This commit is contained in:
Wengier
2021-05-30 21:39:41 -04:00
parent 1b87a51ccb
commit 7b9a86ed29
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build-mingw
View File

@@ -65,6 +65,6 @@ pacman -S --needed --noconfirm mingw-w64-x86_64-libslirp &>/dev/null
echo Compiling DOSBox-X
chmod +x configure
# FIXME: I would like MinGW builds to enable the debugger, eventually
./configure --enable-core-inline --enable-d3d9 --enable-d3d-shaders --prefix=/usr "$@" || exit 1
./configure --enable-core-inline --enable-d3d9 --enable-d3d-shaders --disable-libfluidsynth --prefix=/usr "$@" || exit 1
make -j3 || exit 1

2
build-mingw-sdl2
View File

@@ -63,6 +63,6 @@ pacman -S --needed --noconfirm mingw-w64-x86_64-libslirp &>/dev/null
echo Compiling DOSBox-X
chmod +x configure
# FIXME: I would like MinGW builds to enable the debugger, eventually
./configure --enable-core-inline --enable-d3d9 --enable-d3d-shaders --prefix=/usr --enable-sdl2 "$@" || exit 1
./configure --enable-core-inline --enable-d3d9 --enable-d3d-shaders --disable-libfluidsynth --prefix=/usr --enable-sdl2 "$@" || exit 1
make -j3 || exit 1

2
build-mingw-sdldraw
View File

@@ -60,6 +60,6 @@ pacman -S --needed --noconfirm mingw-w64-x86_64-libslirp &>/dev/null
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 --enable-d3d9 --enable-d3d-shaders --prefix=/usr "$@" || exit 1
./configure --enable-core-inline --enable-force-menu-sdldraw --enable-d3d9 --enable-d3d-shaders --disable-libfluidsynth --prefix=/usr "$@" || exit 1
make -j3 || exit 1

4
src/gui/sdlmain.cpp
View File

@@ -11869,14 +11869,14 @@ bool help_command_callback(DOSBoxMenu * const /*menu*/, DOSBoxMenu::item * const
#if defined(C_SDL2)
int x=-1, y=-1;
#endif
if (!GFX_IsFullscreen()) {
if (!GFX_IsFullscreen()&&!window_was_maximized) {
switchfs=true;
#if defined(C_SDL2)
SDL_GetWindowPosition(sdl.window, &x, &y);
#endif
GFX_SwitchFullScreen();
toscale=false;
}
toscale=false;
helpcmd = menuitem->get_name().substr(8);
GUI_Shortcut(36);
toscale=true;