Enable HAVE_VIDEO_LAYOUT for OSX/Switch/iOS/Android

This commit is contained in:
twinaphex 2019-10-14 00:36:58 +02:00
parent 4fbf823707
commit f983519589
12 changed files with 43 additions and 3 deletions

View File

@ -61,7 +61,7 @@ ifeq ($(HAVE_OPENGL), 1)
HAVE_XMB = 1
HAVE_OZONE = 1
HAVE_OVERLAY = 1
HAVE_VIDEO_LAYOUT = 0
HAVE_VIDEO_LAYOUT = 1
HAVE_GLSL = 1
else
HAVE_RGUI = 1

View File

@ -75,7 +75,7 @@ else
endif
#DEFINES += -DHAVE_VIDEO_LAYOUT
DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_OPENGLES -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_EGL -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_NO_BUILTINZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DHAVE_NETPLAYDISCOVERY -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_OZONE -DHAVE_SHADERPIPELINE -DHAVE_LIBRETRODB -DHAVE_STB_FONT -DHAVE_IMAGEVIEWER -DHAVE_UPDATE_ASSETS -DHAVE_CC_RESAMPLER -DHAVE_MINIUPNPC -DHAVE_BUILTINMINIUPNPC -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -DHAVE_KEYMAPPER -DHAVE_NETWORKGAMEPAD -DHAVE_FLAC -DHAVE_DR_FLAC -DHAVE_DR_MP3 -DHAVE_CHD -DHAVE_RUNAHEAD -DENABLE_HLSL -DHAVE_EASTEREGG -DHAVE_AUDIOMIXER
DEFINES += -DRARCH_MOBILE -DHAVE_GRIFFIN -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DANDROID -DHAVE_DYNAMIC -DHAVE_OPENGL -DHAVE_OVERLAY -DHAVE_VIDEO_LAYOUT -DHAVE_OPENGLES -DGLSL_DEBUG -DHAVE_DYLIB -DHAVE_EGL -DHAVE_GLSL -DHAVE_MENU -DHAVE_RGUI -DHAVE_ZLIB -DHAVE_NO_BUILTINZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DINLINE=inline -DHAVE_THREADS -D__LIBRETRO__ -DHAVE_RSOUND -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DHAVE_NETPLAYDISCOVERY -DRARCH_INTERNAL -DHAVE_FILTERS_BUILTIN -DHAVE_MATERIALUI -DHAVE_XMB -DHAVE_OZONE -DHAVE_SHADERPIPELINE -DHAVE_LIBRETRODB -DHAVE_STB_FONT -DHAVE_IMAGEVIEWER -DHAVE_UPDATE_ASSETS -DHAVE_CC_RESAMPLER -DHAVE_MINIUPNPC -DHAVE_BUILTINMINIUPNPC -DMINIUPNPC_SET_SOCKET_TIMEOUT -DMINIUPNPC_GET_SRC_ADDR -DHAVE_KEYMAPPER -DHAVE_NETWORKGAMEPAD -DHAVE_FLAC -DHAVE_DR_FLAC -DHAVE_DR_MP3 -DHAVE_CHD -DHAVE_RUNAHEAD -DENABLE_HLSL -DHAVE_EASTEREGG -DHAVE_AUDIOMIXER
DEFINES += -DWANT_IFADDRS
DEFINES += -DHAVE_TRANSLATE

View File

@ -4,7 +4,7 @@
//
// Created by Stuart Carnie on 5/10/18.
//
OTHER_CFLAGS = $(inherited) -DHAVE_RUNAHEAD -DHAVE_GRIFFIN -DHAVE_FLAC -DHAVE_DR_FLAC -DHAVE_DR_MP3 -DHAVE_LROUND -DFLAC__HAS_OGG=0 -DHAVE_CHD -DHAVE_STB_VORBIS -DHAVE_MINIUPNPC -DHAVE_BUILTINMINIUPNPC -DHAVE_UPDATE_ASSETS -DHAVE_LANGEXTRA -DRC_DISABLE_LUA -DHAVE_CHEEVOS -DHAVE_IMAGEVIEWER -DHAVE_IOHIDMANAGER -DHAVE_STB_FONT -DHAVE_RGUI -DHAVE_MENU -DHAVE_MENU_WIDGETS -DOSX -DHAVE_CC_RESAMPLER -DHAVE_GLSL -DINLINE=inline -D__LIBRETRO__ -DHAVE_COREAUDIO -DHAVE_DYNAMIC -DHAVE_OVERLAY -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DHAVE_NETPLAYDISCOVERY -DRARCH_INTERNAL -DHAVE_THREADS -DHAVE_DYLIB -DHAVE_7ZIP -DHAVE_MATERIALUI -DHAVE_HID -DHAVE_XMB -DHAVE_SHADERPIPELINE -DHAVE_MMAP -DHAVE_LIBRETRODB -DHAVE_GETOPT_LONG -DHAVE_METAL -DHAVE_COCOA_METAL -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_SPIRV_CROSS -DWANT_GLSLANG -DENABLE_HLSL -DGLSLANG_OSINCLUDE_UNIX -DMETAL_DEBUG -DHAVE_OPENGL -DHAVE_OZONE -DHAVE_EASTEREGG -DHAVE_GIT_VERSION -DHAVE_COREAUDIO3 -DHAVE_AUDIOMIXER -DHAVE_NO_BUILTINZLIB -DHAVE_TRANSLATE
OTHER_CFLAGS = $(inherited) -DHAVE_RUNAHEAD -DHAVE_GRIFFIN -DHAVE_FLAC -DHAVE_DR_FLAC -DHAVE_DR_MP3 -DHAVE_LROUND -DFLAC__HAS_OGG=0 -DHAVE_CHD -DHAVE_STB_VORBIS -DHAVE_MINIUPNPC -DHAVE_BUILTINMINIUPNPC -DHAVE_UPDATE_ASSETS -DHAVE_LANGEXTRA -DRC_DISABLE_LUA -DHAVE_CHEEVOS -DHAVE_IMAGEVIEWER -DHAVE_IOHIDMANAGER -DHAVE_STB_FONT -DHAVE_RGUI -DHAVE_MENU -DHAVE_MENU_WIDGETS -DOSX -DHAVE_CC_RESAMPLER -DHAVE_GLSL -DINLINE=inline -D__LIBRETRO__ -DHAVE_COREAUDIO -DHAVE_DYNAMIC -DHAVE_OVERLAY -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DHAVE_NETWORKGAMEPAD -DHAVE_NETWORKING -DHAVE_NETPLAYDISCOVERY -DRARCH_INTERNAL -DHAVE_THREADS -DHAVE_DYLIB -DHAVE_7ZIP -DHAVE_MATERIALUI -DHAVE_HID -DHAVE_XMB -DHAVE_SHADERPIPELINE -DHAVE_MMAP -DHAVE_LIBRETRODB -DHAVE_GETOPT_LONG -DHAVE_METAL -DHAVE_COCOA_METAL -DHAVE_SLANG -DHAVE_GLSLANG -DHAVE_SPIRV_CROSS -DWANT_GLSLANG -DENABLE_HLSL -DGLSLANG_OSINCLUDE_UNIX -DMETAL_DEBUG -DHAVE_OPENGL -DHAVE_OZONE -DHAVE_EASTEREGG -DHAVE_GIT_VERSION -DHAVE_COREAUDIO3 -DHAVE_AUDIOMIXER -DHAVE_NO_BUILTINZLIB -DHAVE_TRANSLATE -DHAVE_VIDEO_LAYOUT
SRCBASE = $(SRCROOT)/../..
DEPS_DIR = $(SRCBASE)/deps

View File

@ -538,6 +538,7 @@
"-DHAVE_COREAUDIO",
"-DHAVE_DYNAMIC",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_NO_BUILTINZLIB",
"-DHAVE_RPNG",
@ -608,6 +609,7 @@
"-DHAVE_COREAUDIO",
"-DHAVE_DYNAMIC",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_NO_BUILTINZLIB",
"-DHAVE_RPNG",

View File

@ -311,6 +311,7 @@
"-DHAVE_COREAUDIO",
"-DHAVE_DYNAMIC",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -390,6 +391,7 @@
"-DHAVE_COREAUDIO",
"-DHAVE_DYNAMIC",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",

View File

@ -508,6 +508,7 @@
"-DHAVE_COREAUDIO",
"-DHAVE_DYNAMIC",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -600,6 +601,7 @@
"-DHAVE_COREAUDIO",
"-DHAVE_DYNAMIC",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -657,6 +659,7 @@
"-DHAVE_DYNAMIC",
"-DRARCH_INTERNAL",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -749,6 +752,7 @@
"-std=gnu99",
"-DHAVE_COREAUDIO",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -823,6 +827,7 @@
"-std=gnu99",
"-DHAVE_COREAUDIO",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",

View File

@ -515,6 +515,7 @@
"-DRARCH_MOBILE",
"-DHAVE_COREAUDIO",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -606,6 +607,7 @@
"-DRARCH_MOBILE",
"-DHAVE_COREAUDIO",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -663,6 +665,7 @@
"-DHAVE_COREAUDIO",
"-DRARCH_INTERNAL",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -753,6 +756,7 @@
"-std=gnu99",
"-DHAVE_COREAUDIO",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -825,6 +829,7 @@
"-std=gnu99",
"-DHAVE_COREAUDIO",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",

View File

@ -666,6 +666,7 @@
"-DHAVE_COREAUDIO",
"-DHAVE_DYNAMIC",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -759,6 +760,7 @@
"-DHAVE_DYNAMIC",
"-DRARCH_INTERNAL",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -879,6 +881,7 @@
"-DHAVE_COREAUDIO",
"-DHAVE_DYNAMIC",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -999,6 +1002,7 @@
"-DHAVE_COREAUDIO",
"-DHAVE_DYNAMIC",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -1091,6 +1095,7 @@
"-std=gnu99",
"-DHAVE_COREAUDIO",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -1165,6 +1170,7 @@
"-std=gnu99",
"-DHAVE_COREAUDIO",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",

View File

@ -515,6 +515,7 @@
"-DRARCH_MOBILE",
"-DHAVE_COREAUDIO",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -606,6 +607,7 @@
"-DRARCH_MOBILE",
"-DHAVE_COREAUDIO",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -663,6 +665,7 @@
"-DHAVE_COREAUDIO",
"-DRARCH_INTERNAL",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -753,6 +756,7 @@
"-std=gnu99",
"-DHAVE_COREAUDIO",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -825,6 +829,7 @@
"-std=gnu99",
"-DHAVE_COREAUDIO",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",

View File

@ -516,6 +516,7 @@
"-DHAVE_COREAUDIO",
"-DHAVE_DYNAMIC",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -603,6 +604,7 @@
"-DHAVE_COREAUDIO",
"-DHAVE_DYNAMIC",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -657,6 +659,7 @@
"-DHAVE_DYNAMIC",
"-DRARCH_INTERNAL",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -744,6 +747,7 @@
"-std=gnu99",
"-DHAVE_COREAUDIO",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -817,6 +821,7 @@
"-std=gnu99",
"-DHAVE_COREAUDIO",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",

View File

@ -523,6 +523,7 @@
"-std=gnu99",
"-DHAVE_COREAUDIO",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -596,6 +597,7 @@
"-std=gnu99",
"-DHAVE_COREAUDIO",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -674,6 +676,7 @@
"-DHAVE_COREAUDIO",
"-DHAVE_DYNAMIC",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -764,6 +767,7 @@
"-DHAVE_COREAUDIO",
"-DHAVE_DYNAMIC",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -820,6 +824,7 @@
"-DHAVE_DYNAMIC",
"-DRARCH_INTERNAL",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",

View File

@ -538,6 +538,7 @@
"-DHAVE_COREAUDIO",
"-DHAVE_DYNAMIC",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -628,6 +629,7 @@
"-DHAVE_COREAUDIO",
"-DHAVE_DYNAMIC",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -684,6 +686,7 @@
"-DHAVE_DYNAMIC",
"-DRARCH_INTERNAL",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -775,6 +778,7 @@
"-std=gnu99",
"-DHAVE_COREAUDIO",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",
@ -848,6 +852,7 @@
"-std=gnu99",
"-DHAVE_COREAUDIO",
"-DHAVE_OVERLAY",
"-DHAVE_VIDEO_LAYOUT",
"-DHAVE_ZLIB",
"-DHAVE_RPNG",
"-DHAVE_RJPEG",