mirror of
https://github.com/esp8266/Arduino.git
synced 2025-06-17 22:23:10 +03:00
Moving hardware/targets to hardware/cores.
This commit is contained in:
@ -1448,7 +1448,7 @@ public class Editor extends JFrame
|
|||||||
try {
|
try {
|
||||||
if (!sketch.handleRun(new Target(
|
if (!sketch.handleRun(new Target(
|
||||||
System.getProperty("user.dir") + File.separator + "hardware" +
|
System.getProperty("user.dir") + File.separator + "hardware" +
|
||||||
File.separator + "targets", Preferences.get("build.target"))))
|
File.separator + "cores", Preferences.get("build.target"))))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
//runtime = new Runner(sketch, Editor.this);
|
//runtime = new Runner(sketch, Editor.this);
|
||||||
@ -2057,7 +2057,7 @@ public class Editor extends JFrame
|
|||||||
//sketch.exportLibrary() : sketch.exportApplet();
|
//sketch.exportLibrary() : sketch.exportApplet();
|
||||||
boolean success = sketch.exportApplet(new Target(
|
boolean success = sketch.exportApplet(new Target(
|
||||||
System.getProperty("user.dir") + File.separator + "hardware" +
|
System.getProperty("user.dir") + File.separator + "hardware" +
|
||||||
File.separator + "targets", Preferences.get("build.target")));
|
File.separator + "cores", Preferences.get("build.target")));
|
||||||
if (success) {
|
if (success) {
|
||||||
message("Done uploading.");
|
message("Done uploading.");
|
||||||
} else {
|
} else {
|
||||||
|
@ -49,7 +49,7 @@ public class LibraryManager {
|
|||||||
"libraries");
|
"libraries");
|
||||||
target = new Target(
|
target = new Target(
|
||||||
System.getProperty("user.dir") + File.separator + "hardware" +
|
System.getProperty("user.dir") + File.separator + "hardware" +
|
||||||
File.separator + "targets", Preferences.get("build.target"));
|
File.separator + "cores", Preferences.get("build.target"));
|
||||||
refreshLibraries();
|
refreshLibraries();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -78,7 +78,7 @@ public class ExportFolder {
|
|||||||
// success may not be that useful, usually an ex is thrown
|
// success may not be that useful, usually an ex is thrown
|
||||||
success = editor.sketch.exportApplet(new Target(
|
success = editor.sketch.exportApplet(new Target(
|
||||||
System.getProperty("user.dir") + File.separator + "hardware" +
|
System.getProperty("user.dir") + File.separator + "hardware" +
|
||||||
File.separator + "targets", Preferences.get("build.target")));
|
File.separator + "cores", Preferences.get("build.target")));
|
||||||
if (!success) break;
|
if (!success) break;
|
||||||
//System.out.println("success was " + success);
|
//System.out.println("success was " + success);
|
||||||
}
|
}
|
||||||
|
@ -43,7 +43,7 @@
|
|||||||
#
|
#
|
||||||
# 3. Modify the line containg "ARDUINO" to point the directory that
|
# 3. Modify the line containg "ARDUINO" to point the directory that
|
||||||
# contains the Arduino core (for normal Arduino installations, this
|
# contains the Arduino core (for normal Arduino installations, this
|
||||||
# is the lib/targets/arduino sub-directory).
|
# is the hardware/cores/arduino sub-directory).
|
||||||
#
|
#
|
||||||
# 4. Modify the line containing "PORT" to refer to the filename
|
# 4. Modify the line containing "PORT" to refer to the filename
|
||||||
# representing the USB or serial connection to your Arduino board
|
# representing the USB or serial connection to your Arduino board
|
@ -28,7 +28,7 @@
|
|||||||
#
|
#
|
||||||
# 3. Modify the line containg "ARDUINO" to point the directory that
|
# 3. Modify the line containg "ARDUINO" to point the directory that
|
||||||
# contains the Arduino core (for normal Arduino installations, this
|
# contains the Arduino core (for normal Arduino installations, this
|
||||||
# is the lib/targets/arduino sub-directory).
|
# is the hardware/cores/arduino sub-directory).
|
||||||
#
|
#
|
||||||
# 4. Modify the line containing "PORT" to refer to the filename
|
# 4. Modify the line containing "PORT" to refer to the filename
|
||||||
# representing the USB or serial connection to your Arduino board
|
# representing the USB or serial connection to your Arduino board
|
||||||
@ -48,7 +48,7 @@
|
|||||||
PORT = /dev/tty.usbserial-*
|
PORT = /dev/tty.usbserial-*
|
||||||
TARGET = Pd_firmware
|
TARGET = Pd_firmware
|
||||||
ARDUINO = /Applications/arduino-0007
|
ARDUINO = /Applications/arduino-0007
|
||||||
ARDUINO_SRC = $(ARDUINO)/hardware/targets/arduino
|
ARDUINO_SRC = $(ARDUINO)/hardware/cores/arduino
|
||||||
ARDUINO_LIB_SRC = $(ARDUINO)/hardware/libraries
|
ARDUINO_LIB_SRC = $(ARDUINO)/hardware/libraries
|
||||||
INCLUDE = -I$(ARDUINO_SRC) -I$(ARDUINO)/hardware/tools/avr/avr/include \
|
INCLUDE = -I$(ARDUINO_SRC) -I$(ARDUINO)/hardware/tools/avr/avr/include \
|
||||||
-I$(ARDUINO_LIB_SRC)/EEPROM \
|
-I$(ARDUINO_LIB_SRC)/EEPROM \
|
||||||
|
Reference in New Issue
Block a user