Automatically detect toolchain if it is visualcpp, and hence we drop vs2010.rake altogether - it’s no longer needed.

perlun · perlun · commit 172cd281ba22 · 2013-11-22T22:17:01.000+02:00
diff --git 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/visualcpp.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

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-MRuby::Toolchain.new(:vs2012) do \|conf\|`
	`1`	`+MRuby::Toolchain.new(:visualcpp) do \|conf\|`
`2`	`2`	`[conf.cc, conf.cxx].each do \|cc\|`
`3`	`3`	`cc.command = ENV['CC'] \|\| 'cl.exe'`
`4`	`4`	`cc.flags = [ENV['CFLAGS'] \|\| %w(/c /nologo /W3 /D_DEBUG /MDd /Zi /Od /RTC1 /DHAVE_STRING_H /DNO_GETTIMEOFDAY /D_CRT_SECURE_NO_WARNINGS)]`