feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Merge commit 'a884db0825f8c66b694b15fe8900515f9837744a' into develop

Browse Source 
Conflicts:
	platformio/builder/scripts/frameworks/arduino.py
This commit is contained in:
Valeriy Koval
2015-02-05 15:56:54 +02:00
parent 9721172481 a884db0825
commit 3f062f72a2
2 changed files with 44 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
platformio/builder/scripts/frameworks/arduino.py
View File

@@ -26,23 +26,29 @@ if "usb_product" in env.subst("${BOARD_OPTIONS['build']}"):
"${BOARD_OPTIONS['build']['usb_product']}").replace('"', ""))
]
# include board variant
env.VariantDir(
join("$BUILD_DIR", "FrameworkArduinoVariant"),
join("$PLATFORMFW_DIR", "variants", "${BOARD_OPTIONS['build']['variant']}")
)
env.Append(
CPPDEFINES=[
"ARDUINO_ARCH_%s" % env.subst("$PLATFORM").upper()[-3:],
"ARDUINO=%d" % ARDUINO_VERSION
] + ARDUINO_USBDEFINES,
CPPPATH=[
join("$BUILD_DIR", "FrameworkArduino"),
join("$BUILD_DIR", "FrameworkArduinoVariant")
join("$BUILD_DIR", "FrameworkArduino")
]
)
# include board variant
if "variant" in env.get("BOARD_OPTIONS", {}).get("build", {}):
env.VariantDir(
join("$BUILD_DIR", "FrameworkArduinoVariant"),
join("$PLATFORMFW_DIR", "variants",
"${BOARD_OPTIONS['build']['variant']}")
)
env.Append(
CPPPATH=[
join("$BUILD_DIR", "FrameworkArduinoVariant")
]
)
#
# Target: Build Core Library
#