Skip to content

Commit

Permalink
Update sample makefiles
Browse files Browse the repository at this point in the history
fixes #702
  • Loading branch information
PaulStoffregen committed Apr 22, 2023
1 parent bc4e506 commit 78a1d99
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions teensy3/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ endif
OPTIONS = -DF_CPU=48000000 -DUSB_SERIAL -DLAYOUT_US_ENGLISH -DUSING_MAKEFILE

# options needed by many Arduino libraries to configure for Teensy 3.x
OPTIONS += -D__$(MCU)__ -DARDUINO=10805 -DTEENSYDUINO=144
OPTIONS += -D__$(MCU)__ -DARDUINO=10805 -DTEENSYDUINO=159

# use "cortex-m4" for Teensy 3.x
# use "cortex-m0plus" for Teensy LC
Expand Down Expand Up @@ -100,7 +100,7 @@ endif
CPPFLAGS = -Wall -g -Os -mcpu=$(CPUARCH) -mthumb -MMD $(OPTIONS) -I.

# compiler options for C++ only
CXXFLAGS = -std=gnu++14 -felide-constructors -fno-exceptions -fno-rtti
CXXFLAGS = -std=gnu++17 -felide-constructors -fno-exceptions -fno-rtti

# compiler options for C only
CFLAGS =
Expand Down
4 changes: 2 additions & 2 deletions teensy4/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ OPTIONS = -DF_CPU=600000000 -DUSB_SERIAL -DLAYOUT_US_ENGLISH -DUSING_MAKEFILE
# -DUSB_FLIGHTSIM_JOYSTICK

# options needed by many Arduino libraries to configure for Teensy model
OPTIONS += -D__$(MCU)__ -DARDUINO=10813 -DTEENSYDUINO=154 -D$(MCU_DEF)
OPTIONS += -D__$(MCU)__ -DARDUINO=10813 -DTEENSYDUINO=159 -D$(MCU_DEF)

# for Cortex M7 with single & double precision FPU
CPUOPTIONS = -mcpu=cortex-m7 -mfloat-abi=hard -mfpu=fpv5-d16 -mthumb
Expand Down Expand Up @@ -124,7 +124,7 @@ endif
CPPFLAGS = -Wall -g -O2 $(CPUOPTIONS) -MMD $(OPTIONS) -I. -ffunction-sections -fdata-sections

# compiler options for C++ only
CXXFLAGS = -std=gnu++14 -felide-constructors -fno-exceptions -fpermissive -fno-rtti -Wno-error=narrowing
CXXFLAGS = -std=gnu++17 -felide-constructors -fno-exceptions -fpermissive -fno-rtti -Wno-error=narrowing

# compiler options for C only
CFLAGS =
Expand Down

0 comments on commit 78a1d99

Please sign in to comment.