arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-22 08:22:04 +03:00
Code Activity

[sam] fixing compilation in IDE (changing some #includes).

Browse Source
This commit is contained in:
David A. Mellis
2011-07-17 09:50:36 -04:00
parent 25e3924dda
commit d9dcc66232
23 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/processing/app/debug/Compiler.java
View File

@ -219,7 +219,7 @@ public class Compiler implements MessageConsumer {
// collecting them into the core.a library file.
System.out.println("3. compileCore");
System.out.println("corePath: " + corePath);
compileCore(avrBasePath, buildPath, corePath, pins, pinsPath, configPreferences);
compileCore(avrBasePath, buildPath, corePath, systemPath, pins, pinsPath, configPreferences);
/*
@ -762,13 +762,14 @@ public class Compiler implements MessageConsumer {
// 3. compile the core, outputting .o files to <buildPath> and then
// collecting them into the core.a library file.
void compileCore (String avrBasePath, String buildPath, String corePath, String pins, String pinsPath, HashMap<String, String> configPreferences)
void compileCore (String avrBasePath, String buildPath, String corePath, String systemPath, String pins, String pinsPath, HashMap<String, String> configPreferences)
throws RunnerException
{
System.out.println("compileCore(...) start");
ArrayList<String> includePaths = new ArrayList();
includePaths.add(corePath); //include core path only
includePaths.add(systemPath);
if (pinsPath != null) includePaths.add(pinsPath);
//debug includePaths