Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
marlin-anet-a8
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Jonas Leder
marlin-anet-a8
Commits
af83c512
Commit
af83c512
authored
Jul 27, 2017
by
Marcio Teixeira
Browse files
Options
Downloads
Patches
Plain Diff
Added support for U8G.
parent
21591352
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
Marlin/Makefile
+22
-2
22 additions, 2 deletions
Marlin/Makefile
with
22 additions
and
2 deletions
Marlin/Makefile
+
22
−
2
View file @
af83c512
...
@@ -82,6 +82,13 @@ LIQUID_TWI2 ?= 0
...
@@ -82,6 +82,13 @@ LIQUID_TWI2 ?= 0
# this defines if Wire is needed
# this defines if Wire is needed
WIRE
?=
0
WIRE
?=
0
# this defines if U8GLIB is needed (may require RELOC_WORKAROUND)
U8GLIB
?=
1
# this defines whether to add a workaround for the avr-gcc relocation bug
# https://www.stix.id.au/wiki/AVR_relocation_truncations_workaround
RELOC_WORKAROUND
?=
1
############################################################################
############################################################################
# Below here nothing should be changed...
# Below here nothing should be changed...
...
@@ -273,6 +280,10 @@ endif
...
@@ -273,6 +280,10 @@ endif
ifeq
($(NEOPIXEL), 1)
ifeq
($(NEOPIXEL), 1)
VPATH
+=
$(
ARDUINO_INSTALL_DIR
)
/libraries/Adafruit_NeoPixel
VPATH
+=
$(
ARDUINO_INSTALL_DIR
)
/libraries/Adafruit_NeoPixel
endif
endif
ifeq
($(U8GLIB), 1)
VPATH
+=
$(
ARDUINO_INSTALL_DIR
)
/libraries/U8glib
VPATH
+=
$(
ARDUINO_INSTALL_DIR
)
/libraries/U8glib/utility
endif
ifeq
($(HARDWARE_VARIANT), arduino)
ifeq
($(HARDWARE_VARIANT), arduino)
HARDWARE_SUB_VARIANT
?=
mega
HARDWARE_SUB_VARIANT
?=
mega
...
@@ -299,7 +310,7 @@ CXXSRC = WMath.cpp WString.cpp Print.cpp Marlin_main.cpp \
...
@@ -299,7 +310,7 @@ CXXSRC = WMath.cpp WString.cpp Print.cpp Marlin_main.cpp \
temperature.cpp cardreader.cpp configuration_store.cpp
\
temperature.cpp cardreader.cpp configuration_store.cpp
\
watchdog.cpp SPI.cpp servo.cpp Tone.cpp ultralcd.cpp digipot_mcp4451.cpp
\
watchdog.cpp SPI.cpp servo.cpp Tone.cpp ultralcd.cpp digipot_mcp4451.cpp
\
dac_mcp4728.cpp vector_3.cpp least_squares_fit.cpp endstops.cpp stopwatch.cpp utility.cpp
\
dac_mcp4728.cpp vector_3.cpp least_squares_fit.cpp endstops.cpp stopwatch.cpp utility.cpp
\
printcounter.cpp nozzle.cpp serial.cpp
printcounter.cpp nozzle.cpp serial.cpp
gcode.cpp
ifeq
($(NEOPIXEL), 1)
ifeq
($(NEOPIXEL), 1)
CXXSRC
+=
Adafruit_NeoPixel.cpp
CXXSRC
+=
Adafruit_NeoPixel.cpp
endif
endif
...
@@ -315,6 +326,15 @@ SRC += twi.c
...
@@ -315,6 +326,15 @@ SRC += twi.c
CXXSRC
+=
Wire.cpp
CXXSRC
+=
Wire.cpp
endif
endif
ifeq
($(U8GLIB), 1)
SRC
+=
u8g_ll_api.c u8g_bitmap.c u8g_clip.c u8g_com_null.c u8g_delay.c u8g_page.c u8g_pb.c u8g_pb16h1.c u8g_rect.c u8g_state.c u8g_font.c u8g_font_data.c
endif
ifeq
($(RELOC_WORKAROUND), 1)
LD_PREFIX
=
-nodefaultlibs
LD_SUFFIX
=
-lm
-lgcc
-lc
-lgcc
endif
#Check for Arduino 1.0.0 or higher and use the correct source files for that version
#Check for Arduino 1.0.0 or higher and use the correct source files for that version
ifeq
($(shell [ $(ARDUINO_VERSION) -ge 100 ] && echo true), true)
ifeq
($(shell [ $(ARDUINO_VERSION) -ge 100 ] && echo true), true)
CXXSRC
+=
main.cpp
CXXSRC
+=
main.cpp
...
@@ -493,7 +513,7 @@ extcoff: $(TARGET).elf
...
@@ -493,7 +513,7 @@ extcoff: $(TARGET).elf
# Link: create ELF output file from library.
# Link: create ELF output file from library.
$(BUILD_DIR)/$(TARGET).elf
:
$(OBJ) Configuration.h
$(BUILD_DIR)/$(TARGET).elf
:
$(OBJ) Configuration.h
$(
Pecho
)
" CXX
$@
"
$(
Pecho
)
" CXX
$@
"
$P
$(
CC
)
$(
ALL_CXXFLAGS
)
-Wl
,--gc-sections,--relax
-o
$@
-L
.
$(
OBJ
)
$(
LDFLAGS
)
$P
$(
CC
)
$(
LD_PREFIX
)
$(
ALL_CXXFLAGS
)
-Wl
,--gc-sections,--relax
-o
$@
-L
.
$(
OBJ
)
$(
LDFLAGS
)
$(
LD_SUFFIX
)
$(BUILD_DIR)/%.o
:
%.c Configuration.h Configuration_adv.h $(MAKEFILE)
$(BUILD_DIR)/%.o
:
%.c Configuration.h Configuration_adv.h $(MAKEFILE)
$(
Pecho
)
" CC
$<
"
$(
Pecho
)
" CC
$<
"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment