From c2d1de3844ca109ba23a365091504a6b9725268b Mon Sep 17 00:00:00 2001
From: Cristian Maglie <c.maglie@bug.st>
Date: Mon, 9 Jan 2012 18:51:51 +0100
Subject: [PATCH] Removed unused/unuseful defines from platform.txt

---
 app/src/processing/app/Base.java  |  6 ++----
 hardware/arduino/avr/platform.txt | 10 +++-------
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/app/src/processing/app/Base.java b/app/src/processing/app/Base.java
index d447b599a..f680fe076 100644
--- a/app/src/processing/app/Base.java
+++ b/app/src/processing/app/Base.java
@@ -1006,12 +1006,10 @@ public class Base {
     examplesFolder = getContentFile("examples");
     toolsFolder = getContentFile("tools");
     
-    TargetPlatform targetPlatform = getTargetPlatform();
-    PreferencesMap prefs = targetPlatform.getPreferences();
+    File platformFolder = getTargetPlatform().getFolder();
     librariesFolders = new ArrayList<File>();
     librariesFolders.add(getContentFile("libraries"));
-    librariesFolders.add(new File(targetPlatform.getFolder(), prefs
-        .get("library.core.path")));
+    librariesFolders.add(new File(platformFolder, "libraries"));
     librariesFolders.add(getSketchbookLibrariesFolder());
     
     // Scan for libraries in each library folder.
diff --git a/hardware/arduino/avr/platform.txt b/hardware/arduino/avr/platform.txt
index 96a6378e3..4599f8a11 100644
--- a/hardware/arduino/avr/platform.txt
+++ b/hardware/arduino/avr/platform.txt
@@ -19,27 +19,23 @@ compiler.objcopy.eep.flags=-O ihex -j .eeprom --set-section-flags=.eeprom=alloc,
 compiler.elf2hex.flags=-O ihex -R .eeprom
 compiler.elf2hex.cmd=avr-objcopy
 compiler.ldflags=
-compiler.cpudef=-mmcu=
 compiler.upload.cmd=
 compiler.upload.flags=
-compiler.define=-DARDUINO=
-library.path=./hardware/arduino/cores/arduino
-library.core.path=./libraries
 
 # AVR compile patterns
 # --------------------
 
 ## Compile c files
-recipe.c.o.pattern={toolchain_path}{compiler.c.cmd} {compiler.c.flags} {compiler.cpudef}{build.mcu} -DF_CPU={build.f_cpu} -D{software}={ide_version} {includes} {source_file} -o {object_file}
+recipe.c.o.pattern={toolchain_path}{compiler.c.cmd} {compiler.c.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -D{software}={ide_version} {includes} {source_file} -o {object_file}
 
 ## Compile c++ files
-recipe.cpp.o.pattern={toolchain_path}{compiler.cpp.cmd} {compiler.cpp.flags} {compiler.cpudef}{build.mcu} -DF_CPU={build.f_cpu} -D{software}={ide_version} {includes} {source_file} -o {object_file}
+recipe.cpp.o.pattern={toolchain_path}{compiler.cpp.cmd} {compiler.cpp.flags} -mmcu={build.mcu} -DF_CPU={build.f_cpu} -D{software}={ide_version} {includes} {source_file} -o {object_file}
 
 ## Create archives
 recipe.ar.pattern={toolchain_path}{compiler.ar.cmd} {compiler.ar.flags} {build_path}{archive_file} {object_file}
 
 ## Combine gc-sections, archives, and objects
-recipe.c.combine.pattern={toolchain_path}{compiler.c.elf.cmd} {compiler.c.elf.flags} {compiler.cpudef}{build.mcu} -o {build_path}{project_name}.elf {object_files} {build_path}{archive_file} -L{build_path} -lm
+recipe.c.combine.pattern={toolchain_path}{compiler.c.elf.cmd} {compiler.c.elf.flags} -mmcu={build.mcu} -o {build_path}{project_name}.elf {object_files} {build_path}{archive_file} -L{build_path} -lm
 
 ## Create eeprom
 recipe.objcopy.eep.pattern={toolchain_path}{compiler.objcopy.cmd} {compiler.objcopy.eep.flags} {build_path}{project_name}.elf {build_path}{project_name}.eep