AuroraPipeline/fuck-premake-old2
Archived
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Cleaned up deploymentoptions and imageoptions

Browse Source
This commit is contained in:
Jason Perkins 2010-07-20 17:28:01 -04:00
parent b3a1d979ca
commit 613d5ebad5
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.txt
View File

@ -5,6 +5,7 @@
* CHANGED LICENSE FROM GPLv2 TO BSD * CHANGED LICENSE FROM GPLv2 TO BSD
* Added Visual Studio 2010 C/C++ support (Liam Devine) * Added Visual Studio 2010 C/C++ support (Liam Devine)
* Added Solaris support (Dean Ross-Smith) * Added Solaris support (Dean Ross-Smith)
* Added deployment and image options for Xbox360 (dvoid)
* Patch 2963313: Enable setting .NET framework version (Justen Hyde) * Patch 2963313: Enable setting .NET framework version (Justen Hyde)
* Patch 2965229: Fix handling of '+' symbol in file patterns (Rachel Blum) * Patch 2965229: Fix handling of '+' symbol in file patterns (Rachel Blum)
* Patch 2997449: Print configuration with target (ergosys) * Patch 2997449: Print configuration with target (ergosys)

4
src/actions/vstudio/vs200x_vcproj.lua
View File

@ -591,8 +591,8 @@ local vcproj = premake.vstudio.vcproj
_p(3,'<Tool') _p(3,'<Tool')
_p(4,'Name="VCX360DeploymentTool"') _p(4,'Name="VCX360DeploymentTool"')
_p(4,'DeploymentType="0"') _p(4,'DeploymentType="0"')
if #cfg.deployoptions > 0 then if #cfg.deploymentoptions > 0 then
_p(4,'AdditionalOptions="%s"', table.concat(premake.esc(cfg.deployoptions), " ")) _p(4,'AdditionalOptions="%s"', table.concat(premake.esc(cfg.deploymentoptions), " "))
end end
_p(3,'/>') _p(3,'/>')

4
src/base/project.lua
View File

@ -421,7 +421,9 @@
-- --
function premake.gettarget(cfg, direction, pathstyle, namestyle, system) function premake.gettarget(cfg, direction, pathstyle, namestyle, system)
if system == "bsd" then system = "linux" end if system == "bsd" or system == "solaris" then
system = "linux"
end
-- Fix things up based on the current system -- Fix things up based on the current system
local kind = cfg.kind local kind = cfg.kind