SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases 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 \ CXXSRC = WMath.cpp WString.cpp Print.cpp Marlin_main.cpp \
MarlinSerial.cpp Sd2Card.cpp SdBaseFile.cpp SdFatUtil.cpp \ MarlinSerial.cpp Sd2Card.cpp SdBaseFile.cpp SdFatUtil.cpp \
SdFile.cpp SdVolume.cpp motion_control.cpp planner.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 CXXSRC += LiquidCrystal.cpp ultralcd.cpp SPI.cpp
#Check for Arduino 1.0.0 or higher and use the correct sourcefiles for that version #Check for Arduino 1.0.0 or higher and use the correct sourcefiles for that version
@ -212,9 +213,11 @@ DEBUG = stabs
OPT = s OPT = s
DEFINES ?=
# Place -D or -U options here # Place -D or -U options here
CDEFS = -DF_CPU=$(F_CPU) CDEFS = -DF_CPU=$(F_CPU) ${addprefix -D , $(DEFINES)}
CXXDEFS = -DF_CPU=$(F_CPU) CXXDEFS = -DF_CPU=$(F_CPU) ${addprefix -D , $(DEFINES)}
# Add all the source directories as include directories too # Add all the source directories as include directories too
CINCS = ${addprefix -I ,${VPATH}} CINCS = ${addprefix -I ,${VPATH}}