mirror of
https://github.com/libretro/RetroArch
synced 2025-02-20 15:40:44 +00:00
gfx_display and gfx_animation no longer tied to HAVE_MENU
This commit is contained in:
twinaphex
parent
9a6ab81739
commit
f0bdb61fd8
@ -224,6 +224,8 @@ OBJ += \
|
||||
gfx/video_coord_array.o \
|
||||
gfx/video_display_server.o \
|
||||
gfx/video_crt_switch.o \
|
||||
gfx/gfx_display.o \
|
||||
gfx/gfx_animation.o \
|
||||
configuration.o \
|
||||
$(LIBRETRO_COMM_DIR)/dynamic/dylib.o \
|
||||
cores/dynamic_dummy.o \
|
||||
@ -808,7 +810,6 @@ ifeq ($(HAVE_SHADERS_COMMON), 1)
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_MENU_COMMON), 1)
|
||||
OBJ += gfx/gfx_display.o
|
||||
OBJ += menu/menu_driver.o \
|
||||
menu/menu_setting.o \
|
||||
menu/widgets/menu_filebrowser.o \
|
||||
@ -834,7 +835,6 @@ ifeq ($(HAVE_MENU_COMMON), 1)
|
||||
menu/cbs/menu_cbs_down.o \
|
||||
menu/cbs/menu_cbs_contentlist_switch.o \
|
||||
menu/menu_displaylist.o \
|
||||
gfx/gfx_animation.o \
|
||||
menu/drivers/menu_generic.o \
|
||||
menu/menu_thumbnail_path.o \
|
||||
menu/menu_thumbnail.o
|
||||
@ -903,9 +903,7 @@ ifeq ($(HAVE_VITA2D), 1)
|
||||
$(DEPS_DIR)/libvita2d/shader/texture_tint_v_gxp.o \
|
||||
$(DEPS_DIR)/libvita2d/shader/texture_tint_f_gxp.o
|
||||
|
||||
ifeq ($(HAVE_MENU_COMMON),1)
|
||||
OBJ += gfx/drivers_display/gfx_display_vita2d.o
|
||||
endif
|
||||
OBJ += gfx/drivers_display/gfx_display_vita2d.o
|
||||
|
||||
OBJ += gfx/drivers/vita2d_gfx.o \
|
||||
gfx/drivers_font/vita2d_font.o
|
||||
@ -1175,7 +1173,8 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
|
||||
DEFINES += -DHAVE_OPENGL
|
||||
OBJ += gfx/drivers/gl.o \
|
||||
$(LIBRETRO_COMM_DIR)/gfx/gl_capabilities.o \
|
||||
gfx/drivers_font/gl_raster_font.o
|
||||
gfx/drivers_font/gl_raster_font.o \
|
||||
gfx/drivers_display/gfx_display_gl.o
|
||||
endif
|
||||
|
||||
OBJ += $(LIBRETRO_COMM_DIR)/glsym/rglgen.o
|
||||
@ -1183,17 +1182,8 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
|
||||
ifeq ($(HAVE_OPENGL1), 1)
|
||||
DEFINES += -DHAVE_OPENGL1
|
||||
OBJ += gfx/drivers/gl1.o \
|
||||
gfx/drivers_font/gl1_raster_font.o
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_MENU_COMMON), 1)
|
||||
ifeq ($(HAVE_GL_MODERN), 1)
|
||||
OBJ += gfx/drivers_display/gfx_display_gl.o
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_OPENGL1), 1)
|
||||
OBJ += gfx/drivers_display/gfx_display_gl1.o
|
||||
endif
|
||||
gfx/drivers_font/gl1_raster_font.o \
|
||||
gfx/drivers_display/gfx_display_gl1.o
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_VIDEOCORE), 1)
|
||||
@ -1241,11 +1231,8 @@ ifeq ($(HAVE_GL_CONTEXT), 1)
|
||||
gfx/common/metal/MenuDisplay.o \
|
||||
gfx/common/metal_common.o \
|
||||
gfx/drivers/metal.o \
|
||||
gfx/drivers_font/metal_raster_font.o
|
||||
|
||||
ifeq ($(HAVE_MENU_COMMON), 1)
|
||||
OBJ += gfx/drivers_display/gfx_display_metal.o
|
||||
endif
|
||||
gfx/drivers_font/metal_raster_font.o \
|
||||
gfx/drivers_display/gfx_display_metal.o
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_MPV), 1)
|
||||
@ -1341,7 +1328,8 @@ ifeq ($(HAVE_VULKAN), 1)
|
||||
OBJ += gfx/drivers/vulkan.o \
|
||||
gfx/common/vulkan_common.o \
|
||||
$(LIBRETRO_COMM_DIR)/vulkan/vulkan_symbol_wrapper.o \
|
||||
gfx/drivers_font/vulkan_raster_font.o
|
||||
gfx/drivers_font/vulkan_raster_font.o \
|
||||
gfx/drivers_display/gfx_display_vulkan.o
|
||||
|
||||
ifeq ($(HAVE_SLANG), 1)
|
||||
OBJ += gfx/drivers_shader/shader_vulkan.o
|
||||
@ -1350,9 +1338,6 @@ ifeq ($(HAVE_VULKAN), 1)
|
||||
ifeq ($(HAVE_VULKAN_DISPLAY), 1)
|
||||
OBJ += gfx/drivers_context/khr_display_ctx.o
|
||||
endif
|
||||
ifeq ($(HAVE_MENU_COMMON), 1)
|
||||
OBJ += gfx/drivers_display/gfx_display_vulkan.o
|
||||
endif
|
||||
NEED_CXX_LINKER = 1
|
||||
DEFINES += -DHAVE_VULKAN
|
||||
INCLUDE_DIRS += -Igfx/include
|
||||
@ -1361,10 +1346,8 @@ endif
|
||||
ifeq ($(HAVE_OPENGL_CORE), 1)
|
||||
OBJ += gfx/drivers/gl_core.o \
|
||||
gfx/drivers_font/gl_core_raster_font.o \
|
||||
gfx/drivers_shader/shader_gl_core.o
|
||||
ifeq ($(HAVE_MENU_COMMON), 1)
|
||||
OBJ += gfx/drivers_display/gfx_display_gl_core.o
|
||||
endif
|
||||
gfx/drivers_shader/shader_gl_core.o \
|
||||
gfx/drivers_display/gfx_display_gl_core.o
|
||||
|
||||
DEFINES += -DHAVE_OPENGL_CORE
|
||||
NEED_CXX_LINKER = 1
|
||||
@ -1431,10 +1414,8 @@ ifeq ($(HAVE_D3D10), 1)
|
||||
HAVE_D3D_COMMON = 1
|
||||
OBJ += gfx/drivers/d3d10.o \
|
||||
gfx/common/d3d10_common.o \
|
||||
gfx/drivers_font/d3d10_font.o
|
||||
ifeq ($(HAVE_MENU_COMMON), 1)
|
||||
OBJ += gfx/drivers_display/gfx_display_d3d10.o
|
||||
endif
|
||||
gfx/drivers_font/d3d10_font.o \
|
||||
gfx/drivers_display/gfx_display_d3d10.o
|
||||
DEFINES += -DHAVE_D3D10
|
||||
endif
|
||||
|
||||
@ -1442,10 +1423,8 @@ ifeq ($(HAVE_D3D11), 1)
|
||||
HAVE_D3D_COMMON = 1
|
||||
OBJ += gfx/drivers/d3d11.o \
|
||||
gfx/common/d3d11_common.o \
|
||||
gfx/drivers_font/d3d11_font.o
|
||||
ifeq ($(HAVE_MENU_COMMON), 1)
|
||||
OBJ += gfx/drivers_display/gfx_display_d3d11.o
|
||||
endif
|
||||
gfx/drivers_font/d3d11_font.o \
|
||||
gfx/drivers_display/gfx_display_d3d11.o
|
||||
DEFINES += -DHAVE_D3D11
|
||||
endif
|
||||
|
||||
@ -1453,10 +1432,8 @@ ifeq ($(HAVE_D3D12), 1)
|
||||
HAVE_D3D_COMMON = 1
|
||||
OBJ += gfx/drivers/d3d12.o \
|
||||
gfx/common/d3d12_common.o \
|
||||
gfx/drivers_font/d3d12_font.o
|
||||
ifeq ($(HAVE_MENU_COMMON), 1)
|
||||
OBJ += gfx/drivers_display/gfx_display_d3d12.o
|
||||
endif
|
||||
gfx/drivers_font/d3d12_font.o \
|
||||
gfx/drivers_display/gfx_display_d3d12.o
|
||||
DEFINES += -DHAVE_D3D12
|
||||
endif
|
||||
|
||||
@ -1494,20 +1471,14 @@ ifeq ($(HAVE_D3D8), 1)
|
||||
DEFINES += -DHAVE_D3D8
|
||||
OBJ += gfx/drivers/d3d8.o
|
||||
OBJ += gfx/common/d3d8_common.o
|
||||
|
||||
ifeq ($(HAVE_MENU_COMMON), 1)
|
||||
OBJ += gfx/drivers_display/gfx_display_d3d8.o
|
||||
endif
|
||||
OBJ += gfx/drivers_display/gfx_display_d3d8.o
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_D3D9), 1)
|
||||
DEFINES += -DHAVE_D3D9
|
||||
OBJ += gfx/drivers/d3d9.o
|
||||
OBJ += gfx/common/d3d9_common.o
|
||||
|
||||
ifeq ($(HAVE_MENU_COMMON), 1)
|
||||
OBJ += gfx/drivers_display/gfx_display_d3d9.o
|
||||
endif
|
||||
OBJ += gfx/drivers_display/gfx_display_d3d9.o
|
||||
endif
|
||||
|
||||
ifeq ($(HAVE_D3D_COMMON), 1)
|
||||
@ -1979,11 +1950,9 @@ ifneq ($(findstring Win32,$(OS)),)
|
||||
ifeq ($(HAVE_GDI), 1)
|
||||
OBJ += gfx/drivers/gdi_gfx.o \
|
||||
gfx/drivers_context/gdi_ctx.o \
|
||||
gfx/drivers_font/gdi_font.o
|
||||
gfx/drivers_font/gdi_font.o \
|
||||
gfx/drivers_display/gfx_display_gdi.o
|
||||
LIBS += -lmsimg32
|
||||
ifeq ($(HAVE_MENU_COMMON), 1)
|
||||
OBJ += gfx/drivers_display/gfx_display_gdi.o
|
||||
endif
|
||||
endif
|
||||
LIBS += -lhid -lsetupapi
|
||||
endif
|
||||
|
||||
@ -66,6 +66,7 @@
|
||||
#include "../../defaults.h"
|
||||
#include "../../retroarch.h"
|
||||
#include "../../verbosity.h"
|
||||
#include "../../msg_hash.h"
|
||||
#include "../../ui/ui_companion_driver.h"
|
||||
|
||||
#if 1
|
||||
|
||||
@ -76,6 +76,7 @@
|
||||
#include "../../retroarch.h"
|
||||
#include "../../verbosity.h"
|
||||
#include "../../paths.h"
|
||||
#include "../../msg_hash.h"
|
||||
#include "platform_unix.h"
|
||||
|
||||
#ifdef HAVE_MENU
|
||||
|
||||
@ -48,6 +48,7 @@
|
||||
#include "../../verbosity.h"
|
||||
#include "../../ui/drivers/ui_win32.h"
|
||||
#include "../../paths.h"
|
||||
#include "../../msg_hash.h"
|
||||
#include "platform_win32.h"
|
||||
|
||||
#ifndef SM_SERVERR2
|
||||
|
||||
@ -271,6 +271,7 @@ VIDEO CONTEXT
|
||||
|
||||
#ifdef HAVE_VULKAN
|
||||
#include "../gfx/common/vulkan_common.c"
|
||||
#include "../gfx/drivers_display/gfx_display_vulkan.c"
|
||||
#include "../libretro-common/vulkan/vulkan_symbol_wrapper.c"
|
||||
#ifdef HAVE_VULKAN_DISPLAY
|
||||
#include "../gfx/drivers_context/khr_display_ctx.c"
|
||||
@ -376,11 +377,13 @@ VIDEO DRIVER
|
||||
#if defined(HAVE_D3D8)
|
||||
#include "../gfx/drivers/d3d8.c"
|
||||
#include "../gfx/common/d3d8_common.c"
|
||||
#include "../gfx/drivers_display/gfx_display_d3d8.c"
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_D3D9)
|
||||
#include "../gfx/drivers/d3d9.c"
|
||||
#include "../gfx/common/d3d9_common.c"
|
||||
#include "../gfx/drivers_display/gfx_display_d3d9.c"
|
||||
|
||||
#ifdef HAVE_HLSL
|
||||
#include "../gfx/drivers_renderchain/d3d9_hlsl_renderchain.c"
|
||||
@ -397,16 +400,19 @@ VIDEO DRIVER
|
||||
#if defined(HAVE_D3D11)
|
||||
#include "../gfx/drivers/d3d11.c"
|
||||
#include "../gfx/common/d3d11_common.c"
|
||||
#include "../gfx/drivers_display/gfx_display_d3d11.c"
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_D3D12)
|
||||
#include "../gfx/drivers/d3d12.c"
|
||||
#include "../gfx/common/d3d12_common.c"
|
||||
#include "../gfx/drivers_display/gfx_display_d3d12.c"
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_D3D10)
|
||||
#include "../gfx/drivers/d3d10.c"
|
||||
#include "../gfx/common/d3d10_common.c"
|
||||
#include "../gfx/drivers_display/gfx_display_d3d10.c"
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_D3D10) || defined(HAVE_D3D11) || defined(HAVE_D3D12)
|
||||
@ -423,6 +429,7 @@ VIDEO DRIVER
|
||||
|
||||
#if defined(__wiiu__)
|
||||
#include "../gfx/drivers/gx2_gfx.c"
|
||||
#include "../gfx/drivers_display/gfx_display_wiiu.c"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_SDL2
|
||||
@ -448,14 +455,17 @@ VIDEO DRIVER
|
||||
|
||||
#ifdef HAVE_OPENGL1
|
||||
#include "../gfx/drivers/gl1.c"
|
||||
#include "../gfx/drivers_display/gfx_display_gl1.c"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_OPENGL_CORE
|
||||
#include "../gfx/drivers/gl_core.c"
|
||||
#include "../gfx/drivers_display/gfx_display_gl_core.c"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_OPENGL
|
||||
#include "../gfx/drivers/gl.c"
|
||||
#include "../gfx/drivers_display/gfx_display_gl.c"
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGL_CORE)
|
||||
@ -491,8 +501,10 @@ VIDEO DRIVER
|
||||
#include "../deps/libvita2d/source/utils.c"
|
||||
|
||||
#include "../gfx/drivers/vita2d_gfx.c"
|
||||
#include "../gfx/drivers_display/gfx_display_vita2d.c"
|
||||
#elif defined(_3DS)
|
||||
#include "../gfx/drivers/ctr_gfx.c"
|
||||
#include "../gfx/drivers_display/gfx_display_ctr.c"
|
||||
#elif defined(XENON)
|
||||
#include "../gfx/drivers/xenon360_gfx.c"
|
||||
#elif defined(DJGPP)
|
||||
@ -502,6 +514,7 @@ VIDEO DRIVER
|
||||
#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
|
||||
#ifdef HAVE_GDI
|
||||
#include "../gfx/drivers/gdi_gfx.c"
|
||||
#include "../gfx/drivers_display/gfx_display_gdi.c"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
@ -903,6 +916,8 @@ MIDI
|
||||
DRIVERS
|
||||
============================================================ */
|
||||
#include "../gfx/video_crt_switch.c"
|
||||
#include "../gfx/gfx_animation.c"
|
||||
#include "../gfx/gfx_display.c"
|
||||
#include "../gfx/video_display_server.c"
|
||||
#include "../gfx/video_coord_array.c"
|
||||
#ifdef HAVE_AUDIOMIXER
|
||||
@ -1245,7 +1260,6 @@ MENU
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_MENU
|
||||
#include "../gfx/gfx_display.c"
|
||||
#include "../menu/menu_driver.c"
|
||||
#include "../menu/menu_setting.c"
|
||||
#include "../menu/menu_cbs.c"
|
||||
@ -1279,72 +1293,15 @@ MENU
|
||||
#include "../menu/cbs/menu_cbs_down.c"
|
||||
#include "../menu/cbs/menu_cbs_contentlist_switch.c"
|
||||
#include "../menu/menu_displaylist.c"
|
||||
#include "../gfx/gfx_animation.c"
|
||||
#include "../menu/menu_thumbnail_path.c"
|
||||
#include "../menu/menu_thumbnail.c"
|
||||
|
||||
#include "../menu/drivers/menu_generic.c"
|
||||
|
||||
#if defined(HAVE_D3D8)
|
||||
#include "../gfx/drivers_display/gfx_display_d3d8.c"
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_D3D9)
|
||||
#include "../gfx/drivers_display/gfx_display_d3d9.c"
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_D3D10)
|
||||
#include "../gfx/drivers_display/gfx_display_d3d10.c"
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_D3D11)
|
||||
#include "../gfx/drivers_display/gfx_display_d3d11.c"
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_D3D12)
|
||||
#include "../gfx/drivers_display/gfx_display_d3d12.c"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_OPENGL1
|
||||
#include "../gfx/drivers_display/gfx_display_gl1.c"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_OPENGL
|
||||
#include "../gfx/drivers_display/gfx_display_gl.c"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_OPENGL_CORE
|
||||
#include "../gfx/drivers_display/gfx_display_gl_core.c"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_VULKAN
|
||||
#include "../gfx/drivers_display/gfx_display_vulkan.c"
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_VITA2D
|
||||
#include "../gfx/drivers_display/gfx_display_vita2d.c"
|
||||
#endif
|
||||
|
||||
#ifdef _3DS
|
||||
#include "../gfx/drivers_display/gfx_display_ctr.c"
|
||||
#endif
|
||||
|
||||
#ifdef WIIU
|
||||
#include "../gfx/drivers_display/gfx_display_wiiu.c"
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_LIBNX)
|
||||
#include "../gfx/drivers_display/gfx_display_switch.c"
|
||||
#endif
|
||||
|
||||
#if defined(_WIN32) && !defined(_XBOX) && !defined(__WINRT__)
|
||||
#ifdef HAVE_GDI
|
||||
#include "../gfx/drivers_display/gfx_display_gdi.c"
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_RGUI
|
||||
#include "../menu/drivers/rgui.c"
|
||||
#endif
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user