diff options
Diffstat (limited to 'Arduino.mk')
| -rw-r--r-- | Arduino.mk | 24 |
1 files changed, 16 insertions, 8 deletions
@@ -27,18 +27,18 @@ # # PATHS YOU NEED TO SET UP # -# We need to worry about three different sorts of file: +# We need to worry about three different sorts of files: # # 1. The directory where the *.mk files are stored # => ARDMK_DIR # # 2. Things which are always in the Arduino distribution e.g. -# boards.txt, libraries, &c. +# boards.txt, libraries, etc. # => ARDUINO_DIR # # 3. Things which might be bundled with the Arduino distribution, but # might come from the system. Most of the toolchain is like this: -# on Linux it's supplied by the system. +# on Linux it is supplied by the system. # => AVR_TOOLS_DIR # # Having set these three variables, we can work out the rest assuming @@ -91,8 +91,8 @@ # # DEPENDENCIES # -# The Perl programs need a couple of libraries: -# Device::SerialPort +# to reset a board the (python) pySerial program is used. +# please install it prior to continue. # ######################################################################## # @@ -472,8 +472,12 @@ ifndef AVR_TOOLS_PATH AVR_TOOLS_PATH = $(AVR_TOOLS_DIR)/bin endif -ARDUINO_LIB_PATH = $(ARDUINO_DIR)/libraries -$(call show_config_variable,ARDUINO_LIB_PATH,[COMPUTED],(from ARDUINO_DIR)) +ifndef ARDUINO_LIB_PATH + ARDUINO_LIB_PATH = $(ARDUINO_DIR)/libraries + $(call show_config_variable,ARDUINO_LIB_PATH,[COMPUTED],(from ARDUINO_DIR)) +else + $(call show_config_variable,ARDUINO_LIB_PATH,[USER]) +endif # 1.5.x platform dependent libs path ifndef ARDUINO_PLATFORM_LIB_PATH @@ -1035,7 +1039,11 @@ else endif ifndef CXXFLAGS_STD - CXXFLAGS_STD = + ifeq ($(shell expr $(ARDUINO_VERSION) '>' 150), 1) + CXXFLAGS_STD = -std=gnu++11 -fno-threadsafe-statics + else + CXXFLAGS_STD = + endif $(call show_config_variable,CXXFLAGS_STD,[DEFAULT]) else $(call show_config_variable,CXXFLAGS_STD,[USER]) |