mirror of
https://github.com/mruby/mruby
synced 2026-06-08 16:11:16 +00:00
Automatically detect toolchain if it is visualcpp, and hence we drop vs2010.rake altogether - it’s no longer needed.
This commit is contained in:
+7
-1
@@ -1,6 +1,12 @@
|
|||||||
MRuby::Build.new do |conf|
|
MRuby::Build.new do |conf|
|
||||||
# load specific toolchain settings
|
# load specific toolchain settings
|
||||||
toolchain :gcc
|
|
||||||
|
# Gets set by the VS command prompts.
|
||||||
|
if ENV['VisualStudioVersion']
|
||||||
|
toolchain :visualcpp
|
||||||
|
else
|
||||||
|
toolchain :gcc
|
||||||
|
end
|
||||||
|
|
||||||
# Use mrbgems
|
# Use mrbgems
|
||||||
# conf.gem 'examples/mrbgems/ruby_extension_example'
|
# conf.gem 'examples/mrbgems/ruby_extension_example'
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
MRuby::Toolchain.new(:vs2012) do |conf|
|
MRuby::Toolchain.new(:visualcpp) do |conf|
|
||||||
[conf.cc, conf.cxx].each do |cc|
|
[conf.cc, conf.cxx].each do |cc|
|
||||||
cc.command = ENV['CC'] || 'cl.exe'
|
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)]
|
cc.flags = [ENV['CFLAGS'] || %w(/c /nologo /W3 /D_DEBUG /MDd /Zi /Od /RTC1 /DHAVE_STRING_H /DNO_GETTIMEOFDAY /D_CRT_SECURE_NO_WARNINGS)]
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
MRuby::Toolchain.new(:vs2010) do |conf|
|
|
||||||
toolchain :vs2012
|
|
||||||
end
|
|
||||||
Reference in New Issue
Block a user