diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 78b157c..aa055f9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -170,7 +170,7 @@ jobs: - if: ${{ matrix.flavor == 'windows' }} name: Configure Windows Latest run: | - meson setup --warnlevel 3 --buildtype release -Dcpp_std=vc++latest --default-library static -Dcpp_eh=a -Dlibxml2:warning_level=0 -Dminiz:warning_level=0 -Dlibjpeg-turbo:warning_level=0 -Dcpp-httplib:cpp-httplib_openssl=disabled -Dlibxmlpp:build-tests=false -Dlibxml2:python=disabled -Dlibxml2:iconv=disabled --force-fallback-for libpng build + meson setup --warnlevel 3 --buildtype release -Dcpp_std=vc++latest --default-library static -Dcpp_eh=a -Dlibxml2:warning_level=0 -Dminiz:warning_level=0 -Dlibjpeg-turbo:warning_level=0 -Dcpp-httplib:cpp-httplib_openssl=disabled -Dcpp-httplib:cpp_std=vc++latest -Dlibxmlpp:build-tests=false -Dlibxml2:python=disabled -Dlibxml2:iconv=disabled --force-fallback-for libpng build - name: Compile run: ninja -C build diff --git a/meson.build b/meson.build index 395fad9..99edd97 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project('dregarnuhr', ['c', 'cpp'], license : 'GPLv3+', version : '1.5.10.0', - default_options : ['c_std=c17', + default_options : ['c_std=gnu17,c17', 'cpp_std=c++23', 'buildtype=release', 'default_library=static',