From 563253f268a60fd038b24048ff10df9f5f5eb2ea Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 22 Apr 2019 22:59:48 +0200 Subject: [PATCH] More work to make HAVE_OPENGL1 independent --- configuration.c | 2 +- frontend/drivers/platform_win32.c | 2 +- menu/menu_displaylist.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configuration.c b/configuration.c index fcafe9258e..f6f2a90c65 100644 --- a/configuration.c +++ b/configuration.c @@ -321,7 +321,7 @@ enum midi_driver_enum #if defined(HAVE_METAL) static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_METAL; -#elif defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) || defined(__CELLOS_LV2__) +#elif defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_OPENGLES) || defined(__CELLOS_LV2__) static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_GL; #elif defined(GEKKO) static enum video_driver_enum VIDEO_DEFAULT_DRIVER = VIDEO_WII; diff --git a/frontend/drivers/platform_win32.c b/frontend/drivers/platform_win32.c index 032d27a656..9c73f37c53 100644 --- a/frontend/drivers/platform_win32.c +++ b/frontend/drivers/platform_win32.c @@ -468,7 +468,7 @@ static void frontend_win32_environment_get(int *argc, char *argv[], fill_pathname_expand_special(g_defaults.dirs[DEFAULT_DIR_LOGS], ":\\logs", sizeof(g_defaults.dirs[DEFAULT_DIR_LOGS])); #ifdef HAVE_MENU -#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_OPENGLES) snprintf(g_defaults.settings.menu, sizeof(g_defaults.settings.menu), "xmb"); #endif diff --git a/menu/menu_displaylist.c b/menu/menu_displaylist.c index 715430085b..aaac05230d 100644 --- a/menu/menu_displaylist.c +++ b/menu/menu_displaylist.c @@ -374,7 +374,7 @@ static int menu_displaylist_parse_core_info(menu_displaylist_info_t *info) static unsigned menu_displaylist_parse_system_info(menu_displaylist_info_t *info) { int controller; -#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_OPENGLES) gfx_ctx_ident_t ident_info; #endif char tmp[8192]; @@ -706,7 +706,7 @@ static unsigned menu_displaylist_parse_system_info(menu_displaylist_info_t *info } } -#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) +#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL1) || defined(HAVE_OPENGLES) video_context_driver_get_ident(&ident_info); tmp_string = ident_info.ident;