From 847a7c84e10e171844fd7ebd73ff74a5da858f06 Mon Sep 17 00:00:00 2001 From: Raphael Assenat Date: Sat, 17 Oct 2015 23:21:01 -0400 Subject: [PATCH] Update makefiles for version string --- Makefile | 6 +++--- Makefile.inc | 3 ++- Makefile.stk525 | 5 +++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 91108ae..7ea1ec2 100644 --- a/Makefile +++ b/Makefile @@ -2,15 +2,15 @@ CC=avr-gcc AS=$(CC) LD=$(CC) +include Makefile.inc + PROGNAME=n64 OBJDIR=objs-$(PROGNAME) CPU=atmega32u2 -CFLAGS=-Wall -mmcu=$(CPU) -DF_CPU=16000000L -Os -DUART1_STDOUT +CFLAGS=-Wall -mmcu=$(CPU) -DF_CPU=16000000L -Os -DUART1_STDOUT -DVERSIONSTR=$(VERSIONSTR) LDFLAGS=-mmcu=$(CPU) -Wl,-Map=$(PROGNAME).map HEXFILE=$(PROGNAME).hex -include Makefile.inc - all: $(HEXFILE) clean: diff --git a/Makefile.inc b/Makefile.inc index 9e96f35..3a8f4e1 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -1 +1,2 @@ -OBJS=main.o usb.o usbpad.o mappings.o gcn64_protocol.o n64.o gamecube.o usart1.o bootloader.o eeprom.o config.o hiddata.o usbstrings.o intervaltimer.o +OBJS=main.o usb.o usbpad.o mappings.o gcn64_protocol.o n64.o gamecube.o usart1.o bootloader.o eeprom.o config.o hiddata.o usbstrings.o intervaltimer.o version.o +VERSIONSTR=\"3.0.0\" diff --git a/Makefile.stk525 b/Makefile.stk525 index 2a047af..846080f 100644 --- a/Makefile.stk525 +++ b/Makefile.stk525 @@ -2,14 +2,15 @@ CC=avr-gcc AS=$(CC) LD=$(CC) +include Makefile.inc + PROGNAME=n64 OBJDIR=objs-$(PROGNAME) CPU=at90usb1287 -CFLAGS=-Wall -mmcu=$(CPU) -DF_CPU=16000000L -Os -DUART1_STDOUT -DSTK525 +CFLAGS=-Wall -mmcu=$(CPU) -DF_CPU=16000000L -Os -DUART1_STDOUT -DSTK525 -DVERSIONSTR=$(VERSIONSTR) LDFLAGS=-mmcu=$(CPU) -Wl,-Map=$(PROGNAME).map HEXFILE=$(PROGNAME).hex -include Makefile.inc all: $(HEXFILE)