bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Small makefile change, posibility to add defines on the commandline, and fix compiling with watchdog enabled when using the Makefile.

Browse Source
This commit is contained in:
Daid 2012-12-08 11:49:53 +01:00
parent 587154c01b
commit f413aa33b3
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Marlin/Makefile
View File

@ -190,7 +190,8 @@ SRC = wiring.c \
CXXSRC = WMath.cpp WString.cpp Print.cpp Marlin_main.cpp \
MarlinSerial.cpp Sd2Card.cpp SdBaseFile.cpp SdFatUtil.cpp \
SdFile.cpp SdVolume.cpp motion_control.cpp planner.cpp \
stepper.cpp temperature.cpp cardreader.cpp ConfigurationStore.cpp
stepper.cpp temperature.cpp cardreader.cpp ConfigurationStore.cpp \
watchdog.cpp
CXXSRC += LiquidCrystal.cpp ultralcd.cpp SPI.cpp
#Check for Arduino 1.0.0 or higher and use the correct sourcefiles for that version
@ -212,9 +213,11 @@ DEBUG = stabs
OPT = s
DEFINES ?=
# Place -D or -U options here
CDEFS = -DF_CPU=$(F_CPU)
CXXDEFS = -DF_CPU=$(F_CPU)
CDEFS = -DF_CPU=$(F_CPU) ${addprefix -D , $(DEFINES)}
CXXDEFS = -DF_CPU=$(F_CPU) ${addprefix -D , $(DEFINES)}
# Add all the source directories as include directories too
CINCS = ${addprefix -I ,${VPATH}}