The TX97 now correctly uses the W83877 and removed VNC from the Dev branch.

This commit is contained in:
OBattler
2020-04-17 19:40:10 +02:00
parent 63b873892e
commit 3e6994a11c
11 changed files with 10 additions and 78 deletions

View File

@@ -42,9 +42,7 @@
#include <86box/plat.h>
#include <86box/plat_midi.h>
#include <86box/ui.h>
#ifdef USE_VNC
# include <86box/vnc.h>
#endif
#include <86box/vnc.h>
#include <86box/win_sdl.h>
#include <86box/win.h>
@@ -88,17 +86,13 @@ static const struct {
} vid_apis[2][RENDERERS_NUM] = {
{
{ "SDL_Software", 1, (int(*)(void*))sdl_inits, sdl_close, NULL, sdl_pause, sdl_enable },
{ "SDL_Hardware", 1, (int(*)(void*))sdl_inith, sdl_close, NULL, sdl_pause, sdl_enable }
#ifdef USE_VNC
,{ "VNC", 0, vnc_init, vnc_close, vnc_resize, vnc_pause, NULL }
#endif
{ "SDL_Hardware", 1, (int(*)(void*))sdl_inith, sdl_close, NULL, sdl_pause, sdl_enable },
{ "VNC", 0, vnc_init, vnc_close, vnc_resize, vnc_pause, NULL }
},
{
{ "SDL_Software", 1, (int(*)(void*))sdl_inits_fs, sdl_close, sdl_resize, sdl_pause, sdl_enable },
{ "SDL_Hardware", 1, (int(*)(void*))sdl_inith_fs, sdl_close, sdl_resize, sdl_pause, sdl_enable }
#ifdef USE_VNC
,{ "VNC", 0, vnc_init, vnc_close, vnc_resize, vnc_pause, NULL }
#endif
{ "SDL_Hardware", 1, (int(*)(void*))sdl_inith_fs, sdl_close, sdl_resize, sdl_pause, sdl_enable },
{ "VNC", 0, vnc_init, vnc_close, vnc_resize, vnc_pause, NULL }
},
};
@@ -691,12 +685,9 @@ plat_vidapi_name(int api)
break;
case 1:
break;
#ifdef USE_VNC
case 2:
name = "vnc";
break;
#endif
default:
fatal("Unknown renderer: %i\n", api);
break;