From 7a415e3b8de9010f73c9aa760af1e87c8300ea0c Mon Sep 17 00:00:00 2001 From: Patryk Obara Date: Sun, 22 Dec 2019 04:26:10 +0100 Subject: [PATCH] Remove last remains of DirectDraw renderer SDL2 patch replaced it with output=texture renderer=direct3d --- configure.ac | 20 -------------------- src/gui/sdlmain.cpp | 8 -------- src/platform/visualc/config.h | 3 --- 3 files changed, 31 deletions(-) diff --git a/configure.ac b/configure.ac index b26f993b..0fd88981 100644 --- a/configure.ac +++ b/configure.ac @@ -499,26 +499,6 @@ else AC_MSG_RESULT(no) fi -AH_TEMPLATE(C_DDRAW,[Define to 1 to enable output=ddraw (Win32)]) -AC_ARG_ENABLE(ddraw,AC_HELP_STRING([--disable-ddraw],[Disable ddraw support]),,enable_ddraw=yes) -AC_CHECK_HEADER(ddraw.h, have_ddraw_h=yes , have_ddraw_h=no , ) -AC_MSG_CHECKING(whether ddraw display output will be enabled) -if test x$enable_ddraw = xyes; then -case "$host" in - *-*-cygwin* | *-*-mingw* | *-*-msys*) - if test x$have_ddraw_h = xyes ; then - AC_MSG_RESULT(yes) - AC_DEFINE(C_DDRAW,1) - else - AC_MSG_RESULT(no) - fi - ;; - *) - AC_MSG_RESULT(no) - ;; -esac -fi - dnl Check for mprotect. Needed for 64 bits linux AH_TEMPLATE(C_HAVE_MPROTECT,[Define to 1 if you have the mprotect function]) AC_CHECK_HEADER([sys/mman.h], [ diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp index a2840da5..33b2043b 100644 --- a/src/gui/sdlmain.cpp +++ b/src/gui/sdlmain.cpp @@ -99,14 +99,6 @@ extern char** environ; #define WIN32_LEAN_AND_MEAN #endif #include -#if C_DDRAW -#include -struct private_hwdata { - LPDIRECTDRAWSURFACE3 dd_surface; - LPDIRECTDRAWSURFACE3 dd_writebuf; -}; -#endif - #define STDOUT_FILE TEXT("stdout.txt") #define STDERR_FILE TEXT("stderr.txt") #define DEFAULT_CONFIG_FILE "/dosbox.conf" diff --git a/src/platform/visualc/config.h b/src/platform/visualc/config.h index 38e1cc67..9a8f7a02 100644 --- a/src/platform/visualc/config.h +++ b/src/platform/visualc/config.h @@ -7,9 +7,6 @@ /* Define to 1 to enable internal debugger, requires libcurses */ #define C_DEBUG 0 -/* Define to 1 to enable output=ddraw */ -#define C_DDRAW 1 - /* Define to 1 to enable screenshots, requires libpng */ #define C_SSHOT 1