From 55280fa1e58fbcb98ad40923ddc5bbe5b809ecce Mon Sep 17 00:00:00 2001 From: liamDevine Date: Sun, 1 May 2011 03:09:27 +0100 Subject: Applied patch which sets the target machine in visual studio --- tests/actions/vstudio/test_vs200x_vcproj.lua | 34 ++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) (limited to 'tests') diff --git a/tests/actions/vstudio/test_vs200x_vcproj.lua b/tests/actions/vstudio/test_vs200x_vcproj.lua index 0ffc651..2850b5f 100644 --- a/tests/actions/vstudio/test_vs200x_vcproj.lua +++ b/tests/actions/vstudio/test_vs200x_vcproj.lua @@ -668,3 +668,37 @@ local result = io.endcapture() test.string_contains(result,'LinkIncremental="1"') end + + function suite.staticLib_platformX64_MachineX64SetInAdditionalOptions() + local sln1 = solution "sol" + configurations { "foo" } + platforms {'x64'} + + local prj1 = project "prj" + language 'C++' + kind 'StaticLib' + + premake.buildconfigs() + sln1.vstudio_configs = premake.vstudio.buildconfigs(sln1) + prj1= premake.getconfig(sln1.projects[1]) + vc200x.generate(prj1) + local result = io.endcapture() + test.string_contains(result,'AdditionalOptions="/MACHINE:X64"') + end + + function suite.staticLib_platformX32_MachineX86SetInAdditionalOptions() + local sln1 = solution "sol" + configurations { "foo" } + platforms {'x32'} + + local prj1 = project "prj" + language 'C++' + kind 'StaticLib' + + premake.buildconfigs() + sln1.vstudio_configs = premake.vstudio.buildconfigs(sln1) + prj1= premake.getconfig(sln1.projects[1]) + vc200x.generate(prj1) + local result = io.endcapture() + test.string_contains(result,'AdditionalOptions="/MACHINE:X86"') + end -- cgit v1.2.3