Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Remove static configs

Browse Source
This commit is contained in:
momo5502 2016-09-17 14:03:59 +02:00
parent d0f2da8f61
commit cc00171a69
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Jenkinsfile vendored
View File

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

2
build.bat
View File

@ -18,7 +18,7 @@ exit /B 1
:build :build
call generate.bat call generate.bat
set PLATFORM=Win32 set PLATFORM=Win32
set CONFIGURATION=ReleaseStatic set CONFIGURATION=Release
msbuild /nologo /m /v:m %* build\iw4x.sln msbuild /nologo /m /v:m %* build\iw4x.sln
endlocal endlocal
exit /B %ERRORLEVEL% exit /B %ERRORLEVEL%

2
premake/zlib.lua
View File

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

5
premake5.lua
View File

@ -260,7 +260,8 @@ workspace "iw4x"
location "./build" location "./build"
objdir "%{wks.location}/obj" objdir "%{wks.location}/obj"
targetdir "%{wks.location}/bin/%{cfg.buildcfg}" targetdir "%{wks.location}/bin/%{cfg.buildcfg}"
configurations { "Debug", "DebugStatic", "Release", "ReleaseStatic" } --configurations { "Debug", "DebugStatic", "Release", "ReleaseStatic" }
configurations { "Debug", "Release" }
architecture "x32" architecture "x32"
platforms "x86" platforms "x86"
@ -280,7 +281,7 @@ workspace "iw4x"
flags { "MultiProcessorCompile", "Symbols", "No64BitChecks" } flags { "MultiProcessorCompile", "Symbols", "No64BitChecks" }
optimize "Debug" optimize "Debug"
configuration "*Static" --configuration "*Static"
flags { "StaticRuntime" } flags { "StaticRuntime" }
project "iw4x" project "iw4x"