diff options
| author | Per Lundberg <[email protected]> | 2013-11-22 22:17:01 +0200 |
|---|---|---|
| committer | Per Lundberg <[email protected]> | 2013-11-22 22:17:01 +0200 |
| commit | 172cd281ba221e02ef293f85d25ebe7caed8f314 (patch) | |
| tree | 83bf2fe39f5aa3f0a72554fead5e8bac2b134a0f | |
| parent | 07b8a5b0427c21518c7b7cf465197dc310b9d3b0 (diff) | |
| download | mruby-172cd281ba221e02ef293f85d25ebe7caed8f314.tar.gz mruby-172cd281ba221e02ef293f85d25ebe7caed8f314.zip | |
Automatically detect toolchain if it is visualcpp, and hence we drop vs2010.rake altogether - it’s no longer needed.
| -rw-r--r-- | build_config.rb | 8 | ||||
| -rw-r--r-- | tasks/toolchains/visualcpp.rake (renamed from tasks/toolchains/vs2012.rake) | 2 | ||||
| -rw-r--r-- | tasks/toolchains/vs2010.rake | 3 |
3 files changed, 8 insertions, 5 deletions
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 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 |