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

OS/2: Made SDL2 version running

Browse Source
This commit is contained in:
Jochen Sch„fer 2025-04-14 09:43:41 +02:00
parent 5f84caa1d4
commit e6c3eacd5b
5 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure.ac
View File

@ -576,6 +576,10 @@ case "$host" in
AC_DEFINE(OS2, 1, [Compiling on OS/2 EMX])
dnl FEATURE: Whether to support direct serial port pass-through
AC_DEFINE(C_DIRECTSERIAL, 1, [ Define to 1 if you want serial pass-through support (Win32, Posix and OS/2).])
dnl If we have SDL2, we need to link the multimedia extensions.
if test "x$SDL2_LIBS" != "x"; then
LIBS="$LIBS -lmmpm2"
fi
;;
*-*-riscos*)
AC_DEFINE(RISCOS, 1, [Compiling on RISC OS])

4
include/dosbox.h
View File

@ -33,6 +33,10 @@
#include "clockdomain.h"
#include "config.h"
#if defined(OS2) && defined(C_SDL2)
#undef VERSION
#endif
#if defined(C_HAVE_LINUX_KVM) && (C_TARGETCPU == X86 || C_TARGETCPU == X86_64)
# define C_HAVE_LINUX_KVM_X86
#endif

9
src/gui/sdl_mapper.cpp
View File

@ -111,6 +111,15 @@ class CCheckButton;
class CBindButton;
class CModEvent;
#if defined(OS2) && defined(C_SDL2)
#undef CLR_BLACK
#undef CLR_WHITE
#undef CLR_RED
#undef CLR_BLUE
#undef CLR_GREEN
#undef CLR_DARKGREEN
#endif
enum {
CLR_BLACK = 0,
CLR_GREY = 1,

3
src/misc/cross.cpp
View File

@ -16,7 +16,6 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
#include "dosbox.h"
#include "cross.h"
#include "support.h"
@ -184,6 +183,8 @@ void Cross::GetPlatformConfigName(std::string& in) {
#define DEFAULT_CONFIG_FILE "dosbox-x-" VERSION ".conf"
#elif defined(MACOSX)
#define DEFAULT_CONFIG_FILE "DOSBox-X " VERSION " Preferences"
#elif defined(OS2) && defined(C_SDL2)
#define DEFAULT_CONFIG_FILE "dosbox-x-" PACKAGE_VERSION ".conf"
#else /*linux freebsd*/
#define DEFAULT_CONFIG_FILE "dosbox-x-" VERSION ".conf"
#endif

4
src/shell/shell_misc.cpp
View File

@ -107,7 +107,11 @@ void DOS_Shell::ShowPrompt(void) {
WriteOut("%d:%02d:%02d.%02d",reg_ch,reg_cl,reg_dh,reg_dl);
break;
}
#if !defined(OS2) || !defined(C_SDL2)
case 'V': WriteOut("DOSBox-X version %s. Reported DOS version %d.%d.",VERSION,dos.version.major,dos.version.minor); break;
#else
case 'V': WriteOut("DOSBox-X version %s. Reported DOS version %d.%d.",PACKAGE_VERSION,dos.version.major,dos.version.minor); break;
#endif
case '$': WriteOut("$"); break;
case '_': WriteOut("\n"); break;
case 'M': break;