Skip to content

Commit 78bf59a

Browse files
author
Henning Hasemann
committed
adjustments for arduino makefile infrastructure in wiselib
1 parent 193ef7b commit 78bf59a

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

Makefile

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
CC=avr-gcc
22
CXX=avr-g++
3-
MCU=-mmcu=atmega328p
4-
CPU_SPEED=-DF_CPU=16000000UL
5-
VARIANTS=standard
3+
#MCU=-mmcu=atmega328p
4+
#CPU_SPEED=-DF_CPU=16000000UL
5+
#VARIANTS=standard
66

77
SPI_PATH=libraries/SPI
88
PINS_PATH=hardware/arduino/variants/$(VARIANTS)
@@ -15,8 +15,8 @@ HEADER_PATHS=-I$(SPI_PATH) -I$(PINS_PATH) -I$(WIRING_PATH) -I$(ETHERNET_PATH) \
1515
-I$(ETHERNET_PATH)/utility
1616
ENABLE_FLAGS=-DARDUINO_WIRING_DIGITAL -DARDUINO_LITE
1717

18-
CFLAGS=$(MCU) $(CPU_SPEED) $(ENABLE_FLAGS) -Os -w -funsigned-char \
19-
-funsigned-bitfields -fpack-struct -fshort-enums
18+
CFLAGS=-mmcu=$(MCU) -DF_CPU=$(CPU_SPEED) $(ENABLE_FLAGS) -Os -w -funsigned-char \
19+
-funsigned-bitfields -fpack-struct -fshort-enums -fno-exceptions
2020

2121
ARDUINO_FILES=wiring.c wiring_digital.c HardwareSerial.cpp \
2222
WInterrupts.c Print.cpp IPAddress.cpp new.cpp
@@ -31,9 +31,16 @@ ARDUINO_OBJECTS1=$(filter %.cpp, $(ARDUINO_SOURCES))
3131
ARDUINO_OBJECTS2=$(filter %.c, $(ARDUINO_SOURCES))
3232
ARDUINO_OBJECTS=$(ARDUINO_OBJECTS1:.cpp=.o) $(ARDUINO_OBJECTS2:.c=.o)
3333

34+
.phony: clean default
35+
3436
default: $(STATIC_LIBRARIES)
37+
38+
clean:
39+
echo ------------- CLEAN
40+
rm -f libarduino.a libspi.a libethernet.a
3541

3642
libarduino.a: $(ARDUINO_OBJECTS)
43+
echo ------------- LIBARDUINO
3744
avr-ar rcs $@ $^
3845
rm $(ARDUINO_OBJECTS)
3946

hardware/arduino/cores/arduino/Arduino.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
#ifndef Arduino_h
22
#define Arduino_h
33

4+
#define __AVR_LIBC_DEPRECATED_ENABLE__ 1
5+
46
#include <stdlib.h>
57
#include <string.h>
68

0 commit comments

Comments
 (0)