Merge branch 'get-rid-of-non-static-build-configurations' into develop
This commit is contained in:
commit
950e7fed36
4
Jenkinsfile
vendored
4
Jenkinsfile
vendored
@ -37,9 +37,9 @@ import groovy.transform.Field
|
||||
|
||||
@Field def configurations = [
|
||||
"Debug",
|
||||
"DebugStatic",
|
||||
// "DebugStatic",
|
||||
"Release",
|
||||
"ReleaseStatic"
|
||||
// "ReleaseStatic"
|
||||
]
|
||||
|
||||
def useShippedPremake(f) {
|
||||
|
@ -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%
|
||||
|
@ -46,7 +46,7 @@ function zlib.project()
|
||||
warnings "Off"
|
||||
|
||||
kind "SharedLib"
|
||||
configuration "*Static"
|
||||
--configuration "*Static"
|
||||
defines { "_LIB" }
|
||||
removedefines { "_USRDLL", "_DLL", "ZLIB_DLL" }
|
||||
kind "StaticLib"
|
||||
|
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user