Browse Source

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

Daid 12 years ago
parent
commit
f413aa33b3
1 changed files with 6 additions and 3 deletions
  1. 6
    3
      Marlin/Makefile

+ 6
- 3
Marlin/Makefile View File

190
 CXXSRC = WMath.cpp WString.cpp Print.cpp Marlin_main.cpp	\
190
 CXXSRC = WMath.cpp WString.cpp Print.cpp Marlin_main.cpp	\
191
 	MarlinSerial.cpp Sd2Card.cpp SdBaseFile.cpp SdFatUtil.cpp	\
191
 	MarlinSerial.cpp Sd2Card.cpp SdBaseFile.cpp SdFatUtil.cpp	\
192
 	SdFile.cpp SdVolume.cpp motion_control.cpp planner.cpp		\
192
 	SdFile.cpp SdVolume.cpp motion_control.cpp planner.cpp		\
193
-	stepper.cpp temperature.cpp cardreader.cpp ConfigurationStore.cpp
193
+	stepper.cpp temperature.cpp cardreader.cpp ConfigurationStore.cpp \
194
+	watchdog.cpp
194
 CXXSRC += LiquidCrystal.cpp ultralcd.cpp SPI.cpp
195
 CXXSRC += LiquidCrystal.cpp ultralcd.cpp SPI.cpp
195
 
196
 
196
 #Check for Arduino 1.0.0 or higher and use the correct sourcefiles for that version
197
 #Check for Arduino 1.0.0 or higher and use the correct sourcefiles for that version
212
 
213
 
213
 OPT = s
214
 OPT = s
214
 
215
 
216
+DEFINES ?=
217
+
215
 # Place -D or -U options here
218
 # Place -D or -U options here
216
-CDEFS = -DF_CPU=$(F_CPU)
217
-CXXDEFS = -DF_CPU=$(F_CPU)
219
+CDEFS = -DF_CPU=$(F_CPU) ${addprefix -D , $(DEFINES)}
220
+CXXDEFS = -DF_CPU=$(F_CPU) ${addprefix -D , $(DEFINES)}
218
 
221
 
219
 # Add all the source directories as include directories too
222
 # Add all the source directories as include directories too
220
 CINCS = ${addprefix -I ,${VPATH}}
223
 CINCS = ${addprefix -I ,${VPATH}}

Loading…
Cancel
Save