From 107a849f88922370552130735d839f9599a6d0ea Mon Sep 17 00:00:00 2001
From: Ivan Kravets <me@ikravets.com>
Date: Mon, 1 Dec 2014 16:40:46 +0200
Subject: [PATCH] Correct dynamic library name

---
 platformio/builder/scripts/frameworks/arduino.py | 9 +++++----
 platformio/builder/scripts/frameworks/energia.py | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/platformio/builder/scripts/frameworks/arduino.py b/platformio/builder/scripts/frameworks/arduino.py
index 18bd7ae3..d6f8dbf1 100644
--- a/platformio/builder/scripts/frameworks/arduino.py
+++ b/platformio/builder/scripts/frameworks/arduino.py
@@ -31,18 +31,19 @@ if "build.usb_product" in BOARD_OPTIONS:
 
 # include board variant
 env.VariantDir(
-    join("$BUILD_DIR", "variant"),
+    join("$BUILD_DIR", "FrameworkArduinoVariant"),
     join("$PLATFORMFW_DIR", "variants", BOARD_OPTIONS['build.variant'])
 )
 
 env.Append(
     CPPDEFINES=[
+        "ARDUINO_ARCH_AVR",  # @TODO Should be dynamic
         "ARDUINO=%d" % ARDUINO_VERSION,
         "ARDUINO_%s" % BOARD_OPTIONS['build.board']
     ] + ARDUINO_USBDEFINES,
     CPPPATH=[
-        join("$BUILD_DIR", "core"),
-        join("$BUILD_DIR", "variant")
+        join("$BUILD_DIR", "FrameworkArduino"),
+        join("$BUILD_DIR", "FrameworkArduinoVariant")
     ]
 )
 
@@ -63,7 +64,7 @@ libs = []
 #
 
 libs.append(env.BuildLibrary(
-    join("$BUILD_DIR", "core"),
+    join("$BUILD_DIR", "FrameworkArduino"),
     join("$PLATFORMFW_DIR", "cores", BOARD_OPTIONS['build.core'])
 ))
 
diff --git a/platformio/builder/scripts/frameworks/energia.py b/platformio/builder/scripts/frameworks/energia.py
index e86a7b5d..e2bb8a53 100644
--- a/platformio/builder/scripts/frameworks/energia.py
+++ b/platformio/builder/scripts/frameworks/energia.py
@@ -22,7 +22,7 @@ ENERGIA_VERSION = int(
 
 # include board variant
 env.VariantDir(
-    join("$BUILD_DIR", "variant"),
+    join("$BUILD_DIR", "FrameworkEnergiaVariant"),
     join("$PLATFORMFW_DIR", "variants", BOARD_OPTIONS['build.variant'])
 )
 
@@ -32,8 +32,8 @@ env.Append(
         "ENERGIA=%d" % ENERGIA_VERSION
     ],
     CPPPATH=[
-        join("$BUILD_DIR", "core"),
-        join("$BUILD_DIR", "variant")
+        join("$BUILD_DIR", "FrameworkEnergia"),
+        join("$BUILD_DIR", "FrameworkEnergiaVariant")
     ]
 )
 
@@ -60,7 +60,7 @@ libs = []
 #
 
 libs.append(env.BuildLibrary(
-    join("$BUILD_DIR", "core"),
+    join("$BUILD_DIR", "FrameworkEnergia"),
     join("$PLATFORMFW_DIR", "cores", BOARD_OPTIONS['build.core'])
 ))