Merge pull request #5994 from StefanBruens/fix_Makefile_errors
Fix makefile errors, cleanup
This commit is contained in:
commit
7ddd94dc61
@ -247,16 +247,6 @@ F_CPU ?= 16000000
|
||||
# Libraries, the "hardware variant" are for boards
|
||||
# that derives from that, and their source are present in
|
||||
# the main Marlin source directory
|
||||
ifeq ($(HARDWARE_VARIANT), $(filter $(HARDWARE_VARIANT),arduino Sanguino))
|
||||
HARDWARE_DIR = $(ARDUINO_INSTALL_DIR)/hardware
|
||||
else
|
||||
ifeq ($(shell [ $(ARDUINO_VERSION) -ge 100 ] && echo true), true)
|
||||
HARDWARE_DIR = ../ArduinoAddons/Arduino_1.x.x
|
||||
else
|
||||
HARDWARE_DIR = ../ArduinoAddons/Arduino_0.xx
|
||||
endif
|
||||
endif
|
||||
HARDWARE_SRC= $(HARDWARE_DIR)/arduino/avr/cores/arduino
|
||||
|
||||
TARGET = $(notdir $(CURDIR))
|
||||
|
||||
@ -266,12 +256,10 @@ TARGET = $(notdir $(CURDIR))
|
||||
|
||||
VPATH = .
|
||||
VPATH += $(BUILD_DIR)
|
||||
VPATH += $(HARDWARE_SRC)
|
||||
ifeq ($(HARDWARE_VARIANT), $(filter $(HARDWARE_VARIANT),arduino Teensy Sanguino))
|
||||
VPATH += $(HARDWARE_DIR)/marlin/avr/libraries/LiquidCrystal/src
|
||||
VPATH += $(HARDWARE_DIR)/marlin/avr/libraries/SPI
|
||||
VPATH += $(HARDWARE_DIR)/arduino/avr/libraries/SPI
|
||||
VPATH += $(HARDWARE_DIR)/arduino/avr/libraries/SPI/src
|
||||
VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/cores/arduino
|
||||
|
||||
VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/SPI
|
||||
VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/libraries/SPI/src
|
||||
VPATH += $(ARDUINO_INSTALL_DIR)/libraries/LiquidCrystal/src
|
||||
ifeq ($(LIQUID_TWI2), 1)
|
||||
VPATH += $(ARDUINO_INSTALL_DIR)/libraries/Wire
|
||||
@ -282,22 +270,9 @@ ifeq ($(WIRE), 1)
|
||||
VPATH += $(ARDUINO_INSTALL_DIR)/libraries/Wire
|
||||
VPATH += $(ARDUINO_INSTALL_DIR)/libraries/Wire/utility
|
||||
endif
|
||||
else
|
||||
VPATH += $(HARDWARE_DIR)/libraries/LiquidCrystal
|
||||
VPATH += $(HARDWARE_DIR)/libraries/SPI
|
||||
ifeq ($(LIQUID_TWI2), 1)
|
||||
VPATH += $(HARDWARE_DIR)/libraries/Wire
|
||||
VPATH += $(HARDWARE_DIR)/libraries/Wire/utility
|
||||
VPATH += $(HARDWARE_DIR)/libraries/LiquidTWI2
|
||||
endif
|
||||
ifeq ($(WIRE), 1)
|
||||
VPATH += $(HARDWARE_DIR)/libraries/Wire
|
||||
VPATH += $(HARDWARE_DIR)/libraries/Wire/utility
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(HARDWARE_VARIANT), arduino)
|
||||
HARDWARE_SUB_VARIANT ?= mega
|
||||
VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/variants/$(HARDWARE_SUB_VARIANT)
|
||||
VPATH += $(ARDUINO_INSTALL_DIR)/hardware/arduino/avr/variants/$(HARDWARE_SUB_VARIANT)
|
||||
else
|
||||
ifeq ($(HARDWARE_VARIANT), Sanguino)
|
||||
@ -320,7 +295,8 @@ CXXSRC = WMath.cpp WString.cpp Print.cpp Marlin_main.cpp \
|
||||
SdFile.cpp SdVolume.cpp planner.cpp stepper.cpp \
|
||||
temperature.cpp cardreader.cpp configuration_store.cpp \
|
||||
watchdog.cpp SPI.cpp servo.cpp Tone.cpp ultralcd.cpp digipot_mcp4451.cpp \
|
||||
dac_mcp4728.cpp vector_3.cpp qr_solve.cpp endstops.cpp stopwatch.cpp utility.cpp
|
||||
dac_mcp4728.cpp vector_3.cpp qr_solve.cpp endstops.cpp stopwatch.cpp utility.cpp \
|
||||
printcounter.cpp nozzle.cpp
|
||||
ifeq ($(LIQUID_TWI2), 0)
|
||||
CXXSRC += LiquidCrystal.cpp
|
||||
else
|
||||
@ -393,7 +369,7 @@ ifneq ($(HARDWARE_MOTHERBOARD),)
|
||||
CTUNING += -DMOTHERBOARD=${HARDWARE_MOTHERBOARD}
|
||||
endif
|
||||
#CEXTRA = -Wa,-adhlns=$(<:.c=.lst)
|
||||
CEXTRA = -fno-use-cxa-atexit
|
||||
CEXTRA = -fno-use-cxa-atexit -fno-threadsafe-statics
|
||||
|
||||
CFLAGS := $(CDEBUG) $(CDEFS) $(CINCS) -O$(OPT) $(CWARN) $(CEXTRA) $(CTUNING) $(CSTANDARD)
|
||||
CXXFLAGS := $(CDEFS) $(CINCS) -O$(OPT) -Wall $(CEXTRA) $(CTUNING) $(CXXSTANDARD)
|
||||
|
Loading…
Reference in New Issue
Block a user