From 05173d8a2df46e3a60a0b5c60910faad271257bd Mon Sep 17 00:00:00 2001 From: Andrew Eikum Date: Tue, 22 Oct 2019 09:12:17 -0500 Subject: [PATCH] build: Pass in CXXFLAGS for building DXVK code in Wine --- build/makefile_base.mak | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/build/makefile_base.mak b/build/makefile_base.mak index 1d69738f..55d5e54d 100644 --- a/build/makefile_base.mak +++ b/build/makefile_base.mak @@ -811,7 +811,8 @@ $(WINE_CONFIGURE_FILES64): $(MAKEFILE_DEP) | faudio64 $(WINE_OBJ64) bison64 cd $(dir $@) && \ STRIP=$(STRIP_QUOTED) \ BISON=$(abspath $(BISON_BIN64)) \ - CFLAGS=-I$(abspath $(TOOLS_DIR64))"/include -g $(COMMON_FLAGS)" \ + CFLAGS="-I$(abspath $(TOOLS_DIR64))/include -g $(COMMON_FLAGS)" \ + CXXFLAGS="-I$(abspath $(TOOLS_DIR64))/include -g $(COMMON_FLAGS) -std=c++17" \ LDFLAGS=-L$(abspath $(TOOLS_DIR64))/lib \ PKG_CONFIG_PATH=$(abspath $(TOOLS_DIR64))/lib/pkgconfig \ CC=$(CC_QUOTED) \ @@ -827,7 +828,8 @@ $(WINE_CONFIGURE_FILES32): $(MAKEFILE_DEP) | faudio32 $(WINE_OBJ32) bison32 cd $(dir $@) && \ STRIP=$(STRIP_QUOTED) \ BISON=$(abspath $(BISON_BIN32)) \ - CFLAGS=-I$(abspath $(TOOLS_DIR32))"/include -g $(COMMON_FLAGS)" \ + CFLAGS="-I$(abspath $(TOOLS_DIR32))/include -g $(COMMON_FLAGS)" \ + CXXFLAGS="-I$(abspath $(TOOLS_DIR32))/include -g $(COMMON_FLAGS) -std=c++17" \ LDFLAGS=-L$(abspath $(TOOLS_DIR32))/lib \ PKG_CONFIG_PATH=$(abspath $(TOOLS_DIR32))/lib/pkgconfig \ CC=$(CC_QUOTED) \