From 5061ce7f155256553287ec420fa0d2c7c6b077c3 Mon Sep 17 00:00:00 2001 From: /dev/urandom Date: Mon, 26 Sep 2016 00:55:48 +0200 Subject: [PATCH] Fix wrong correction for static-only builds. --- premake5.lua | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/premake5.lua b/premake5.lua index 9c28dccb..8e599255 100644 --- a/premake5.lua +++ b/premake5.lua @@ -260,7 +260,6 @@ workspace "iw4x" location "./build" objdir "%{wks.location}/obj" targetdir "%{wks.location}/bin/%{cfg.buildcfg}" - --configurations { "Debug", "DebugStatic", "Release", "ReleaseStatic" } configurations { "Debug", "Release" } architecture "x32" platforms "x86" @@ -268,6 +267,8 @@ workspace "iw4x" -- VS 2015 toolset only toolset "msc-140" + flags { "StaticRuntime" } + configuration "windows" defines { "_WINDOWS", "WIN32" } @@ -280,9 +281,7 @@ workspace "iw4x" defines { "DEBUG", "_DEBUG" } flags { "MultiProcessorCompile", "Symbols", "No64BitChecks" } optimize "Debug" - - --configuration "*Static" - flags { "StaticRuntime" } + symbols "On" project "iw4x" kind "SharedLib" @@ -396,7 +395,7 @@ workspace "iw4x" "copy /y \"$(TargetDir)*.pdb\" \"" .. saneCopyToPath .. "\"", } end - + -- This has to be the last one, as otherwise VisualStudio will succeed building even if copying fails postbuildcommands { "copy /y \"$(TargetDir)*.dll\" \"" .. saneCopyToPath .. "\"",