From 172cd281ba221e02ef293f85d25ebe7caed8f314 Mon Sep 17 00:00:00 2001 From: Per Lundberg Date: Fri, 22 Nov 2013 22:17:01 +0200 Subject: [PATCH] =?UTF-8?q?Automatically=20detect=20toolchain=20if=20it=20?= =?UTF-8?q?is=20visualcpp,=20and=20hence=20we=20drop=20vs2010.rake=20altog?= =?UTF-8?q?ether=20-=20it=E2=80=99s=20no=20longer=20needed.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build_config.rb | 8 +++++++- tasks/toolchains/{vs2012.rake => visualcpp.rake} | 2 +- tasks/toolchains/vs2010.rake | 3 --- 3 files changed, 8 insertions(+), 5 deletions(-) rename tasks/toolchains/{vs2012.rake => visualcpp.rake} (97%) delete mode 100644 tasks/toolchains/vs2010.rake diff --git a/build_config.rb b/build_config.rb index fce424686..83dc01940 100644 --- a/build_config.rb +++ b/build_config.rb @@ -1,6 +1,12 @@ MRuby::Build.new do |conf| # load specific toolchain settings - toolchain :gcc + + # Gets set by the VS command prompts. + if ENV['VisualStudioVersion'] + toolchain :visualcpp + else + toolchain :gcc + end # Use mrbgems # conf.gem 'examples/mrbgems/ruby_extension_example' diff --git a/tasks/toolchains/vs2012.rake b/tasks/toolchains/visualcpp.rake similarity index 97% rename from tasks/toolchains/vs2012.rake rename to tasks/toolchains/visualcpp.rake index f4039cc29..fc51dbc02 100644 --- a/tasks/toolchains/vs2012.rake +++ b/tasks/toolchains/visualcpp.rake @@ -1,4 +1,4 @@ -MRuby::Toolchain.new(:vs2012) do |conf| +MRuby::Toolchain.new(:visualcpp) do |conf| [conf.cc, conf.cxx].each do |cc| cc.command = ENV['CC'] || 'cl.exe' cc.flags = [ENV['CFLAGS'] || %w(/c /nologo /W3 /D_DEBUG /MDd /Zi /Od /RTC1 /DHAVE_STRING_H /DNO_GETTIMEOFDAY /D_CRT_SECURE_NO_WARNINGS)] diff --git a/tasks/toolchains/vs2010.rake b/tasks/toolchains/vs2010.rake deleted file mode 100644 index 783dc8831..000000000 --- a/tasks/toolchains/vs2010.rake +++ /dev/null @@ -1,3 +0,0 @@ -MRuby::Toolchain.new(:vs2010) do |conf| - toolchain :vs2012 -end