mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-02 07:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9179 from QuarkTheAwesome/master

Browse Source 
(wiiu) spirv-cross requires C++ exceptions, glslang can't work
This commit is contained in:
Twinaphex 2019-07-24 04:31:35 +02:00 committed by GitHub
commit 2a943ece84
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.wiiu
View File

@ -93,8 +93,6 @@ endif
OBJ += gfx/drivers/gx2_shaders/snow.o OBJ += gfx/drivers/gx2_shaders/snow.o
OBJ += gfx/drivers/gx2_shaders/snow_simple.o OBJ += gfx/drivers/gx2_shaders/snow_simple.o
OBJ += gfx/drivers/gx2_shaders/snowflake.o OBJ += gfx/drivers/gx2_shaders/snowflake.o
OBJ += gfx/drivers_shader/slang_preprocess.o
OBJ += gfx/drivers_shader/glslang_util.o
ifeq ($(GRIFFIN_BUILD), 1) ifeq ($(GRIFFIN_BUILD), 1)
OBJ += griffin/griffin.o OBJ += griffin/griffin.o
@ -109,7 +107,7 @@ endif
DEFINES += -DHAVE_AUDIOMIXER DEFINES += -DHAVE_AUDIOMIXER
DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_LIBRETRODB DEFINES += -DHAVE_GRIFFIN=1 -DHAVE_MENU -DHAVE_RGUI -DHAVE_LIBRETRODB
DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_CC_RESAMPLER DEFINES += -DHAVE_ZLIB -DHAVE_RPNG -DHAVE_RJPEG -DHAVE_RBMP -DHAVE_RTGA -DWANT_ZLIB -DHAVE_CC_RESAMPLER
DEFINES += -DHAVE_SPIRV_CROSS -DHAVE_GLSLANG -DHAVE_SLANG DEFINES += -DHAVE_SPIRV_CROSS -DHAVE_SLANG
DEFINES += -DHAVE_STB_FONT -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DHAVE_LIBRETRODB -DHAVE_NETWORKING -DHAVE_NETPLAYDISCOVERY DEFINES += -DHAVE_STB_FONT -DHAVE_STB_VORBIS -DHAVE_LANGEXTRA -DHAVE_LIBRETRODB -DHAVE_NETWORKING -DHAVE_NETPLAYDISCOVERY
#DEFINES += -DWANT_IFADDRS #DEFINES += -DWANT_IFADDRS
#DEFINES += -DHAVE_FREETYPE #DEFINES += -DHAVE_FREETYPE
@ -143,7 +141,6 @@ endif
HAVE_CHEEVOS = 1 HAVE_CHEEVOS = 1
#WANT_IFADDRS = 1 #WANT_IFADDRS = 1
HAVE_OVERLAY = 1 HAVE_OVERLAY = 1
HAVE_GLSLANG = 1
HAVE_SPIRV_CROSS = 1 HAVE_SPIRV_CROSS = 1
HAVE_SLANG = 1 HAVE_SLANG = 1
HAVE_VIDEO_LAYOUT = 0 HAVE_VIDEO_LAYOUT = 0
@ -218,7 +215,6 @@ else
endif endif
ASFLAGS := $(CFLAGS) -mregnames ASFLAGS := $(CFLAGS) -mregnames
CXXFLAGS = $(CFLAGS) -fno-rtti -fno-exceptions
#----------------------------- #-----------------------------
# Linking/library flags # Linking/library flags