From 1f4d7ae747055f06e1d376dec60409f551ecb7f3 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Tue, 12 Dec 2017 13:06:09 +0100 Subject: [PATCH] [general] Defining c++17 in project file directly, rather than as a compiler argument --- build-win32.txt | 2 +- build-win64.txt | 2 +- meson.build | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build-win32.txt b/build-win32.txt index 57cfbe1c..3166c9cb 100644 --- a/build-win32.txt +++ b/build-win32.txt @@ -9,7 +9,7 @@ exe_wrapper = 'wine' c_args = ['-Og', '-ggdb'] c_link_args = ['-static', '-static-libgcc'] -cpp_args = ['-std=c++17', '-Og', '-gstabs'] +cpp_args = ['-Og', '-gstabs'] cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++', '-Wl,--add-stdcall-alias'] [host_machine] diff --git a/build-win64.txt b/build-win64.txt index 6203d34c..63d67d83 100644 --- a/build-win64.txt +++ b/build-win64.txt @@ -9,7 +9,7 @@ exe_wrapper = 'wine' c_args = ['-Og', '-ggdb'] c_link_args = ['-static', '-static-libgcc'] -cpp_args = ['-std=c++17', '-Og', '-gstabs'] +cpp_args = ['-Og', '-gstabs'] cpp_link_args = ['-static', '-static-libgcc', '-static-libstdc++'] [host_machine] diff --git a/meson.build b/meson.build index b3d32cdb..cd0d5706 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('dxvk', ['c', 'cpp']) +project('dxvk', ['c', 'cpp'], default_options : ['cpp_std=c++17']) cpu_family = target_machine.cpu_family()