From 249cd4783c1a5e17f0171c767eb3c7bd688d21dd Mon Sep 17 00:00:00 2001 From: Bartosz Taudul Date: Tue, 8 May 2018 01:21:19 +0200 Subject: [PATCH] Use C++17 in server. --- capture/build/unix/build.mk | 2 +- capture/build/win32/capture.vcxproj | 2 ++ standalone/build/unix/build.mk | 2 +- standalone/build/win32/Tracy.vcxproj | 2 ++ 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/capture/build/unix/build.mk b/capture/build/unix/build.mk index 99c1418e..9fb2956e 100644 --- a/capture/build/unix/build.mk +++ b/capture/build/unix/build.mk @@ -1,5 +1,5 @@ CFLAGS += -CXXFLAGS := $(CFLAGS) -std=gnu++14 +CXXFLAGS := $(CFLAGS) -std=gnu++17 DEFINES += -DTRACY_NO_STATISTICS INCLUDES := LIBS := -lpthread diff --git a/capture/build/win32/capture.vcxproj b/capture/build/win32/capture.vcxproj index aef83464..71a75e73 100644 --- a/capture/build/win32/capture.vcxproj +++ b/capture/build/win32/capture.vcxproj @@ -87,6 +87,7 @@ true TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 + stdcpp17 ws2_32.lib;%(AdditionalDependencies) @@ -118,6 +119,7 @@ true TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 + stdcpp17 true diff --git a/standalone/build/unix/build.mk b/standalone/build/unix/build.mk index fb496e9e..604d7c6d 100644 --- a/standalone/build/unix/build.mk +++ b/standalone/build/unix/build.mk @@ -1,5 +1,5 @@ CFLAGS += -CXXFLAGS := $(CFLAGS) -std=c++14 +CXXFLAGS := $(CFLAGS) -std=c++17 DEFINES += INCLUDES := $(shell pkg-config --cflags glfw3 gtk+-2.0) -I../../../imgui -I../../libs/gl3w LIBS := $(shell pkg-config --libs glfw3 gtk+-2.0) -lpthread -ldl -lGL diff --git a/standalone/build/win32/Tracy.vcxproj b/standalone/build/win32/Tracy.vcxproj index dd843754..999c2e79 100644 --- a/standalone/build/win32/Tracy.vcxproj +++ b/standalone/build/win32/Tracy.vcxproj @@ -55,6 +55,7 @@ true AdvancedVectorExtensions2 Caret + stdcpp17 ws2_32.lib;opengl32.lib;..\..\libs\glfw\lib-vc2015\glfw3.lib;%(AdditionalDependencies) @@ -74,6 +75,7 @@ true AdvancedVectorExtensions2 Caret + stdcpp17 true