Changeset 214 for rtos_arduino

Timestamp:

Apr 2, 2016, 3:00:05 PM (8 years ago)

Author:

ertl-yutaka

Message:

MacOS対応．

File:

• rtos_arduino/trunk/asp_1.9.2/target/arduino_m0_gcc/Makefile.target (modified) (4 diffs)

rtos_arduino/trunk/asp_1.9.2/target/arduino_m0_gcc/Makefile.target

@@ -20 +20 @@
 
 #
-# Arduinoの開発環境のパス(Windows表記)
+#  環境の判定
 #
-ARDUINO_BASE_DIR_WIN = C:\Program Files (x86)\Arduino
+ifneq (,$(findstring /cygdrive/,$(PATH)))
+    UNAME_TARGET := Cygwin
+    ARDUINO_BASE_DIR = C:\Program Files (x86)\Arduino
+else
+ifneq (,$(findstring Windows,$(PATH)))
+    UNAME_TARGET := Windows
+    ARDUINO_BASE_DIR = C:\Program Files (x86)\Arduino
+else
+    UNAME_TARGET := MacOS
+    ARDUINO_BASE_DIR = /Applications/Arduino.app/Contents/Java
+endif
+endif
 
 #
@@ -32 +43 @@
 # ライブラリを使用する
 #
-ARDUINO_LIB_DIR = $(ARDUINO_BASE_DIR_WIN)
+ARDUINO_LIB_DIR = $(ARDUINO_BASE_DIR)
 endif
 
@@ -128 +139 @@
 include $(SRCDIR)/arch/$(PRC)_$(TOOL)/common/Makefile.core
 
-
-#
-#  環境の判定
-#
-ifneq (,$(findstring /cygdrive/,$(PATH)))
-    UNAME_TARGET := Cygwin
-else
-ifneq (,$(findstring Windows,$(PATH)))
-    UNAME_TARGET := Windows
-else
-    UNAME_TARGET := Unix
-endif
-endif
-
-
 #
 #  フラッシュへの書き込み
 #
-OPENOCD_PATH = $(ARDUINO_BASE_DIR_WIN)\hardware\tools\OpenOCD-0.9.0-arduino\bin\openocd.exe
-OPENOCD_SCRIPT_PATH = $(ARDUINO_BASE_DIR_WIN)\hardware\tools\OpenOCD-0.9.0-arduino\share\openocd\scripts
-OPENOCD_SCRIPT  = $(ARDUINO_BASE_DIR_WIN)\hardware\arduino\samd\variants\arduino_zero\openocd_scripts\arduino_zero.cfg
+ifeq ($(UNAME_TARGET), Cygwin)
+     OPENOCD_PATH = $(ARDUINO_BASE_DIR)\hardware\tools\OpenOCD-0.9.0-arduino\bin\openocd.exe
+     OPENOCD_SCRIPT_PATH = $(ARDUINO_BASE_DIR)\hardware\tools\OpenOCD-0.9.0-arduino\share\openocd\scripts
+     OPENOCD_SCRIPT  = $(ARDUINO_BASE_DIR)\hardware\arduino\samd\variants\arduino_zero\openocd_scripts\arduino_zero.cfg
+endif
+ifeq ($(UNAME_TARGET), MacOS)
+     OPENOCD_PATH = $(ARDUINO_BASE_DIR)/hardware/tools/OpenOCD-0.9.0-arduino/bin/openocd
+     OPENOCD_SCRIPT_PATH = $(ARDUINO_BASE_DIR)/hardware/tools/OpenOCD-0.9.0-arduino/share/openocd/scripts
+     OPENOCD_SCRIPT  = $(ARDUINO_BASE_DIR)/hardware/arduino/samd/variants/arduino_zero/openocd_scripts/arduino_zero.cfg
+endif
 
 ifeq ($(UNAME_TARGET), Cygwin)
         GDB = arm-gdb_m0.exe
 else
-        GDB = $(ARDUINO_BASE_DIR_WIN)\hardware\tools\gcc-arm-none-eabi-4.8.3-2014q1\bin\arm-none-eabi-gdb
+ifeq ($(UNAME_TARGET), MacOS)
+        GDB = $(ARDUINO_BASE_DIR)/hardware/tools/gcc-arm-none-eabi-4.8.3-2014q1/bin/arm-none-eabi-gdb
+endif
 endif
 
@@ -167 +172 @@
         cygstart "$(OPENOCD_PATH)" '-s "$(OPENOCD_SCRIPT_PATH)"' '-f "$(OPENOCD_SCRIPT)"'
 else
+ifeq ($(UNAME_TARGET), Windows)
         start /MIN "" "$(OPENOCD_PATH)" -s "$(OPENOCD_SCRIPT_PATH)" -f "$(OPENOCD_SCRIPT)"
+else
+ifeq ($(UNAME_TARGET), MacOS)
+        $(OPENOCD_PATH) -s "$(OPENOCD_SCRIPT_PATH)" -f "$(OPENOCD_SCRIPT)"
+endif
+endif
 endif