1
0
Fork 0

first commit

This commit is contained in:
root 2024-11-23 01:15:11 +02:00
commit 528f89a79b
90 changed files with 13567 additions and 0 deletions

View file

@ -0,0 +1,12 @@
diff --git a/configure.ac b/configure.ac
index 8e98dc4e9..a21cb36f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -422,6 +422,7 @@ if test -n "$SDL2_LIBS"; then
CPPFLAGS="$CPPFLAGS $SDL2_CFLAGS"
else
if test -n "$SDL_LIBS"; then
+ SDL_LIBS="$(echo "$SDL_LIBS" | sed -e 's/-Wl,-rpath,[[^ ]]\+ //')"
LIBS="$LIBS $SDL_LIBS"
CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
else

View file

@ -0,0 +1,30 @@
--- b/src/output/output_opengl.cpp
+++ a/src/output/output_opengl.cpp
@@ -199,11 +199,7 @@
#if DOSBOXMENU_TYPE == DOSBOXMENU_SDLDRAW
/* scale the menu bar if the window is large enough */
+ {
- /* SDL drawn menus cannot coexist with 3Dfx emulation. In fact, there is a serious
- * bug in SDL1 builds that rapidly expands the vertical size of the menu every frame. */
- if (Voodoo_OGL_GetWidth() != 0 && Voodoo_OGL_GetHeight() != 0 && Voodoo_OGL_Active() && sdl.desktop.prevent_fullscreen) {
- }
- else {
int cw = fixedWidth, ch = fixedHeight;
int scale = 1;
@@ -259,12 +255,8 @@
#if DOSBOXMENU_TYPE == DOSBOXMENU_SDLDRAW
if (mainMenu.isVisible() && !sdl.desktop.fullscreen)
{
+ windowHeight += mainMenu.menuBox.h;
+ sdl.clip.y += mainMenu.menuBox.h;
- if (Voodoo_OGL_GetWidth() != 0 && Voodoo_OGL_GetHeight() != 0 && Voodoo_OGL_Active() && sdl.desktop.prevent_fullscreen) {
- }
- else {
- windowHeight += mainMenu.menuBox.h;
- sdl.clip.y += mainMenu.menuBox.h;
- }
}
#endif