From cc00171a69988d7c157e49ef01a455d272e9151e Mon Sep 17 00:00:00 2001 From: momo5502 Date: Sat, 17 Sep 2016 14:03:59 +0200 Subject: [PATCH] Remove static configs --- Jenkinsfile | 4 ++-- build.bat | 2 +- premake/zlib.lua | 2 +- premake5.lua | 5 +++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 43e578c5..86f53cf8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -37,9 +37,9 @@ import groovy.transform.Field @Field def configurations = [ "Debug", - "DebugStatic", + // "DebugStatic", "Release", - "ReleaseStatic" + // "ReleaseStatic" ] def useShippedPremake(f) { diff --git a/build.bat b/build.bat index ba34dfd9..cdb8f28c 100644 --- a/build.bat +++ b/build.bat @@ -18,7 +18,7 @@ exit /B 1 :build call generate.bat set PLATFORM=Win32 -set CONFIGURATION=ReleaseStatic +set CONFIGURATION=Release msbuild /nologo /m /v:m %* build\iw4x.sln endlocal exit /B %ERRORLEVEL% diff --git a/premake/zlib.lua b/premake/zlib.lua index 22d79c26..b520c48d 100644 --- a/premake/zlib.lua +++ b/premake/zlib.lua @@ -46,7 +46,7 @@ function zlib.project() warnings "Off" kind "SharedLib" - configuration "*Static" + --configuration "*Static" defines { "_LIB" } removedefines { "_USRDLL", "_DLL", "ZLIB_DLL" } kind "StaticLib" diff --git a/premake5.lua b/premake5.lua index 13fa124d..9c28dccb 100644 --- a/premake5.lua +++ b/premake5.lua @@ -260,7 +260,8 @@ workspace "iw4x" location "./build" objdir "%{wks.location}/obj" targetdir "%{wks.location}/bin/%{cfg.buildcfg}" - configurations { "Debug", "DebugStatic", "Release", "ReleaseStatic" } + --configurations { "Debug", "DebugStatic", "Release", "ReleaseStatic" } + configurations { "Debug", "Release" } architecture "x32" platforms "x86" @@ -280,7 +281,7 @@ workspace "iw4x" flags { "MultiProcessorCompile", "Symbols", "No64BitChecks" } optimize "Debug" - configuration "*Static" + --configuration "*Static" flags { "StaticRuntime" } project "iw4x"