summaryrefslogtreecommitdiffhomepage
path: root/examples
diff options
context:
space:
mode:
authorYukihiro "Matz" Matsumoto <[email protected]>2014-05-11 17:26:45 +0900
committerYukihiro "Matz" Matsumoto <[email protected]>2014-05-11 17:26:45 +0900
commitb1eb337a34f4b304f08a5bc59f03b6fc1ac02027 (patch)
tree67102107891c6318acc07afcd36c5325453c3da7 /examples
parent9f7651fa6568eebb6cfba6717abdbf0e993ec9b5 (diff)
parent2f22829097fcc879ae68dd8fee01d4e8dd94cb4a (diff)
downloadmruby-b1eb337a34f4b304f08a5bc59f03b6fc1ac02027.tar.gz
mruby-b1eb337a34f4b304f08a5bc59f03b6fc1ac02027.zip
Merge pull request #2231 from kyab/update_example_build_config
Update example build_config to include host build setting
Diffstat (limited to 'examples')
-rw-r--r--examples/targets/build_config_ArduinoDue.rb (renamed from examples/targets/ArduinoDue.rb)18
-rw-r--r--examples/targets/build_config_IntelGalileo.rb (renamed from examples/targets/IntelGalileo.rb)18
-rw-r--r--examples/targets/build_config_chipKITMax32.rb (renamed from examples/targets/chipKitMax32.rb)18
3 files changed, 51 insertions, 3 deletions
diff --git a/examples/targets/ArduinoDue.rb b/examples/targets/build_config_ArduinoDue.rb
index a850eabb6..eadcfdd43 100644
--- a/examples/targets/ArduinoDue.rb
+++ b/examples/targets/build_config_ArduinoDue.rb
@@ -1,8 +1,24 @@
+MRuby::Build.new do |conf|
+
+ # Gets set by the VS command prompts.
+ if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR']
+ toolchain :visualcpp
+ else
+ toolchain :gcc
+ end
+
+ enable_debug
+
+ # include the default GEMs
+ conf.gembox 'default'
+
+end
+
# Cross Compiling configuration for Arduino Due
# http://arduino.cc/en/Main/ArduinoBoardDue
#
# Requires Arduino IDE >= 1.5
-MRuby::CrossBuild.new("Arduino Due") do |conf|
+MRuby::CrossBuild.new("ArduinoDue") do |conf|
toolchain :gcc
# Mac OS X
diff --git a/examples/targets/IntelGalileo.rb b/examples/targets/build_config_IntelGalileo.rb
index 185b6e71e..42f800d9f 100644
--- a/examples/targets/IntelGalileo.rb
+++ b/examples/targets/build_config_IntelGalileo.rb
@@ -1,8 +1,24 @@
+MRuby::Build.new do |conf|
+
+ # Gets set by the VS command prompts.
+ if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR']
+ toolchain :visualcpp
+ else
+ toolchain :gcc
+ end
+
+ enable_debug
+
+ # include the default GEMs
+ conf.gembox 'default'
+
+end
+
+
# Cross Compiling configuration for Intel Galileo on Arduino environment
# http://arduino.cc/en/ArduinoCertified/IntelGalileo
#
# Requires Arduino IDE for Intel Galileo
-
MRuby::CrossBuild.new("Galileo") do |conf|
toolchain :gcc
diff --git a/examples/targets/chipKitMax32.rb b/examples/targets/build_config_chipKITMax32.rb
index b3a7c7c7d..72fbd5c85 100644
--- a/examples/targets/chipKitMax32.rb
+++ b/examples/targets/build_config_chipKITMax32.rb
@@ -1,3 +1,19 @@
+MRuby::Build.new do |conf|
+
+ # Gets set by the VS command prompts.
+ if ENV['VisualStudioVersion'] || ENV['VSINSTALLDIR']
+ toolchain :visualcpp
+ else
+ toolchain :gcc
+ end
+
+ enable_debug
+
+ # include the default GEMs
+ conf.gembox 'default'
+
+end
+
# Cross Compiling configuration for Digilent chipKIT Max32
# http://www.digilentinc.com/Products/Detail.cfm?Prod=CHIPKIT-MAX32
#
@@ -5,7 +21,7 @@
#
# This configuration is based on @kyab's version
# http://d.hatena.ne.jp/kyab/20130201
-MRuby::CrossBuild.new("chipKitMax32") do |conf|
+MRuby::CrossBuild.new("chipKITMax32") do |conf|
toolchain :gcc
# Mac OS X