diff options
Diffstat (limited to 'src/actions')
-rw-r--r-- | src/actions/vstudio/vs2005_solution.lua | 3 | ||||
-rw-r--r-- | src/actions/vstudio/vs2010_vcxproj.lua | 9 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/actions/vstudio/vs2005_solution.lua b/src/actions/vstudio/vs2005_solution.lua index 3f4622b..a5bbd70 100644 --- a/src/actions/vstudio/vs2005_solution.lua +++ b/src/actions/vstudio/vs2005_solution.lua @@ -67,9 +67,6 @@ -- function sln2005.projectdependencies(prj) - -- VS2010 C# gets dependencies right from the projects; doesn't need rules here - if _ACTION > "vs2008" and prj.language == "C#" then return end - local deps = premake.getdependencies(prj) if #deps > 0 then _p('\tProjectSection(ProjectDependencies) = postProject') diff --git a/src/actions/vstudio/vs2010_vcxproj.lua b/src/actions/vstudio/vs2010_vcxproj.lua index bc7bd2e..1335390 100644 --- a/src/actions/vstudio/vs2010_vcxproj.lua +++ b/src/actions/vstudio/vs2010_vcxproj.lua @@ -127,6 +127,12 @@ local cfg = premake.getconfig(prj, cfginfo.src_buildcfg, cfginfo.src_platform) _p(2,'<OutDir '..if_config_and_platform() ..'>%s\\</OutDir>' , premake.esc(cfginfo.name),premake.esc(cfg.buildtarget.directory) ) + + if cfg.platform == "Xbox360" then + _p(2,'<OutputFile '..if_config_and_platform() ..'>$(OutDir)%s</OutputFile>' + , premake.esc(cfginfo.name),cfg.buildtarget.name ) + end + _p(2,'<IntDir '..if_config_and_platform() ..'>%s\\</IntDir>' , premake.esc(cfginfo.name), premake.esc(cfg.objectsdir)) _p(2,'<TargetName '..if_config_and_platform() ..'>%s</TargetName>' @@ -362,7 +368,8 @@ end local function item_def_lib(cfg) - if cfg.kind == 'StaticLib' then + -- The Xbox360 project files are stored in another place in the project file. + if cfg.kind == 'StaticLib' and cfg.platform ~= "Xbox360" then _p(1,'<Lib>') _p(2,'<OutputFile>$(OutDir)%s</OutputFile>',cfg.buildtarget.name) additional_options(2,cfg) |