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

Correct dynamic library name

Browse Source
This commit is contained in:
Ivan Kravets
2014-12-01 16:40:46 +02:00
parent ddab7046ca
commit 107a849f88
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,18 +31,19 @@ if "build.usb_product" in BOARD_OPTIONS:
# include board variant # include board variant
env.VariantDir( env.VariantDir(
join("$BUILD_DIR", "variant"), join("$BUILD_DIR", "FrameworkArduinoVariant"),
join("$PLATFORMFW_DIR", "variants", BOARD_OPTIONS['build.variant']) join("$PLATFORMFW_DIR", "variants", BOARD_OPTIONS['build.variant'])
) )
env.Append( env.Append(
CPPDEFINES=[ CPPDEFINES=[
"ARDUINO_ARCH_AVR", # @TODO Should be dynamic
"ARDUINO=%d" % ARDUINO_VERSION, "ARDUINO=%d" % ARDUINO_VERSION,
"ARDUINO_%s" % BOARD_OPTIONS['build.board'] "ARDUINO_%s" % BOARD_OPTIONS['build.board']
] + ARDUINO_USBDEFINES, ] + ARDUINO_USBDEFINES,
CPPPATH=[ CPPPATH=[
join("$BUILD_DIR", "core"), join("$BUILD_DIR", "FrameworkArduino"),
join("$BUILD_DIR", "variant") join("$BUILD_DIR", "FrameworkArduinoVariant")
] ]
) )
@ -63,7 +64,7 @@ libs = []
# #
libs.append(env.BuildLibrary( libs.append(env.BuildLibrary(
join("$BUILD_DIR", "core"), join("$BUILD_DIR", "FrameworkArduino"),
join("$PLATFORMFW_DIR", "cores", BOARD_OPTIONS['build.core']) join("$PLATFORMFW_DIR", "cores", BOARD_OPTIONS['build.core'])
)) ))

8
platformio/builder/scripts/frameworks/energia.py
View File

@ -22,7 +22,7 @@ ENERGIA_VERSION = int(
# include board variant # include board variant
env.VariantDir( env.VariantDir(
join("$BUILD_DIR", "variant"), join("$BUILD_DIR", "FrameworkEnergiaVariant"),
join("$PLATFORMFW_DIR", "variants", BOARD_OPTIONS['build.variant']) join("$PLATFORMFW_DIR", "variants", BOARD_OPTIONS['build.variant'])
) )
@ -32,8 +32,8 @@ env.Append(
"ENERGIA=%d" % ENERGIA_VERSION "ENERGIA=%d" % ENERGIA_VERSION
], ],
CPPPATH=[ CPPPATH=[
join("$BUILD_DIR", "core"), join("$BUILD_DIR", "FrameworkEnergia"),
join("$BUILD_DIR", "variant") join("$BUILD_DIR", "FrameworkEnergiaVariant")
] ]
) )
@ -60,7 +60,7 @@ libs = []
# #
libs.append(env.BuildLibrary( libs.append(env.BuildLibrary(
join("$BUILD_DIR", "core"), join("$BUILD_DIR", "FrameworkEnergia"),
join("$PLATFORMFW_DIR", "cores", BOARD_OPTIONS['build.core']) join("$PLATFORMFW_DIR", "cores", BOARD_OPTIONS['build.core'])
)) ))