[Premake] Upgrade to VS2017
This commit is contained in:
parent
c8c29b55b9
commit
a1c14cd03f
@ -1,4 +1,4 @@
|
|||||||
@echo off
|
@echo off
|
||||||
echo Updating submodules...
|
echo Updating submodules...
|
||||||
git submodule update --init --recursive
|
git submodule update --init --recursive
|
||||||
tools\premake5 %* vs2015
|
tools\premake5 %* vs2017
|
@ -240,9 +240,6 @@ workspace "iw4x"
|
|||||||
platforms "x86"
|
platforms "x86"
|
||||||
exceptionhandling ("SEH")
|
exceptionhandling ("SEH")
|
||||||
|
|
||||||
-- VS 2015 toolset only
|
|
||||||
toolset "msc-140"
|
|
||||||
|
|
||||||
flags { "StaticRuntime" }
|
flags { "StaticRuntime" }
|
||||||
|
|
||||||
configuration "windows"
|
configuration "windows"
|
||||||
@ -266,7 +263,7 @@ workspace "iw4x"
|
|||||||
project "iw4x"
|
project "iw4x"
|
||||||
kind "SharedLib"
|
kind "SharedLib"
|
||||||
language "C++"
|
language "C++"
|
||||||
flags { "C++14" }
|
cppdialect "C++17"
|
||||||
files {
|
files {
|
||||||
"./src/**.rc",
|
"./src/**.rc",
|
||||||
"./src/**.hpp",
|
"./src/**.hpp",
|
||||||
@ -376,7 +373,8 @@ workspace "iw4x"
|
|||||||
end
|
end
|
||||||
|
|
||||||
-- Specific configurations
|
-- Specific configurations
|
||||||
flags { "UndefinedIdentifiers", "ExtraWarnings" }
|
flags { "UndefinedIdentifiers" }
|
||||||
|
warnings "Extra"
|
||||||
|
|
||||||
if symbols ~= nil then
|
if symbols ~= nil then
|
||||||
symbols "On"
|
symbols "On"
|
||||||
|
@ -255,7 +255,7 @@ namespace Assets
|
|||||||
{
|
{
|
||||||
// TODO: Allow loading assets from raw!
|
// TODO: Allow loading assets from raw!
|
||||||
if (Game::s_elemFields[i].handler(&session, element)) break;
|
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());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Binary file not shown.
Loading…
Reference in New Issue
Block a user