Merge branch 'get-rid-of-non-static-build-configurations' into develop

This commit is contained in:
/dev/urandom 2016-09-17 16:22:48 +02:00
commit 950e7fed36
No known key found for this signature in database
GPG Key ID: 41322B973E0F295E
4 changed files with 7 additions and 6 deletions

4
Jenkinsfile vendored
View File

@ -37,9 +37,9 @@ import groovy.transform.Field
@Field def configurations = [
"Debug",
"DebugStatic",
// "DebugStatic",
"Release",
"ReleaseStatic"
// "ReleaseStatic"
]
def useShippedPremake(f) {

View File

@ -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%

View File

@ -46,7 +46,7 @@ function zlib.project()
warnings "Off"
kind "SharedLib"
configuration "*Static"
--configuration "*Static"
defines { "_LIB" }
removedefines { "_USRDLL", "_DLL", "ZLIB_DLL" }
kind "StaticLib"

View File

@ -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"