diff --git a/generate.bat b/generate.bat index f2b3e8bb..6ed718cd 100644 --- a/generate.bat +++ b/generate.bat @@ -1,4 +1,4 @@ @echo off echo Updating submodules... git submodule update --init --recursive -tools\premake5 %* vs2015 \ No newline at end of file +tools\premake5 %* vs2017 \ No newline at end of file diff --git a/premake5.lua b/premake5.lua index 5b6b78f9..cdbab227 100644 --- a/premake5.lua +++ b/premake5.lua @@ -240,9 +240,6 @@ workspace "iw4x" platforms "x86" exceptionhandling ("SEH") - -- VS 2015 toolset only - toolset "msc-140" - flags { "StaticRuntime" } configuration "windows" @@ -266,7 +263,7 @@ workspace "iw4x" project "iw4x" kind "SharedLib" language "C++" - flags { "C++14" } + cppdialect "C++17" files { "./src/**.rc", "./src/**.hpp", @@ -376,7 +373,8 @@ workspace "iw4x" end -- Specific configurations - flags { "UndefinedIdentifiers", "ExtraWarnings" } + flags { "UndefinedIdentifiers" } + warnings "Extra" if symbols ~= nil then symbols "On" diff --git a/src/Components/Modules/AssetInterfaces/IFxEffectDef.cpp b/src/Components/Modules/AssetInterfaces/IFxEffectDef.cpp index a303a021..ce7803bd 100644 --- a/src/Components/Modules/AssetInterfaces/IFxEffectDef.cpp +++ b/src/Components/Modules/AssetInterfaces/IFxEffectDef.cpp @@ -255,7 +255,7 @@ namespace Assets { // TODO: Allow loading assets from raw! if (Game::s_elemFields[i].handler(&session, element)) break; - Components::Logger::Error("Failed to parse element %s!\n", newValue); + Components::Logger::Error("Failed to parse element %s!\n", newValue.data()); } } diff --git a/tools/premake5.exe b/tools/premake5.exe index ebe7ae7e..09eabf2c 100644 Binary files a/tools/premake5.exe and b/tools/premake5.exe differ