From 613d5ebad5171d7d4e1a844eafd4e0ea95a6fc2e Mon Sep 17 00:00:00 2001 From: Jason Perkins Date: Tue, 20 Jul 2010 17:28:01 -0400 Subject: [PATCH] Cleaned up deploymentoptions and imageoptions --- CHANGES.txt | 1 + src/actions/vstudio/vs200x_vcproj.lua | 4 ++-- src/base/project.lua | 4 +++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 568bbade..f2d57d21 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -5,6 +5,7 @@ * CHANGED LICENSE FROM GPLv2 TO BSD * Added Visual Studio 2010 C/C++ support (Liam Devine) * Added Solaris support (Dean Ross-Smith) +* Added deployment and image options for Xbox360 (dvoid) * Patch 2963313: Enable setting .NET framework version (Justen Hyde) * Patch 2965229: Fix handling of '+' symbol in file patterns (Rachel Blum) * Patch 2997449: Print configuration with target (ergosys) diff --git a/src/actions/vstudio/vs200x_vcproj.lua b/src/actions/vstudio/vs200x_vcproj.lua index 24ba6729..bd46faa7 100644 --- a/src/actions/vstudio/vs200x_vcproj.lua +++ b/src/actions/vstudio/vs200x_vcproj.lua @@ -591,8 +591,8 @@ local vcproj = premake.vstudio.vcproj _p(3,' 0 then - _p(4,'AdditionalOptions="%s"', table.concat(premake.esc(cfg.deployoptions), " ")) + if #cfg.deploymentoptions > 0 then + _p(4,'AdditionalOptions="%s"', table.concat(premake.esc(cfg.deploymentoptions), " ")) end _p(3,'/>') diff --git a/src/base/project.lua b/src/base/project.lua index 8d684c99..62a4e1bb 100644 --- a/src/base/project.lua +++ b/src/base/project.lua @@ -421,7 +421,9 @@ -- 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 local kind = cfg.kind