From 54b210eb14d1fee112cc5d91816635c951a7ab9a Mon Sep 17 00:00:00 2001 From: Jacob Young Date: Sat, 12 Feb 2022 17:37:44 -0500 Subject: [PATCH] Tag v0.0.4b release. --- CHANGELOG.md | 3 +++ README.md | 2 +- makefile | 44 ++++++++++++++++++++------------------------ src/main.c | 1 + 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b15cc11..c49461d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,3 +10,6 @@ ## v0.0.3b - Use new usbdrvce error handling features. - Improve build system. + +## v0.0.4b +- Recompile for new usbdrvce. diff --git a/README.md b/README.md index d70810b..56aa779 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# prgmTRANSFER v0.0.3b +# prgmTRANSFER v0.0.4b ### This software is still in beta, no liability for corrupted or lost files, etc! diff --git a/makefile b/makefile index 978a554..d4a9d91 100644 --- a/makefile +++ b/makefile @@ -2,35 +2,31 @@ # Makefile Options # ---------------------------- -CC ?= clang +NATIVECC = clang -NAME ?= TRANSFER -MAJOR_VERSION ?= 0 -MINOR_VERSION ?= 0 -PATCH_VERSION ?= 4 -KIND_VERSION ?= n -BUILD_VERSION ?= -$(shell git rev-parse --short HEAD) -FULL_VERSION ?= v$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_VERSION)$(KIND_VERSION)$(BUILD_VERSION) -ICON ?= transfer.png -DESCRIPTION ?= "Variable Transfer Program $(FULL_VERSION)" -COMPRESSED ?= YES -ARCHIVED ?= YES +NAME = TRANSFER +MAJOR_VERSION = 0 +MINOR_VERSION = 0 +PATCH_VERSION = 4 +KIND_VERSION = n +BUILD_VERSION = -$(shell git rev-parse --short HEAD) +FULL_VERSION = v$(MAJOR_VERSION).$(MINOR_VERSION).$(PATCH_VERSION)$(KIND_VERSION)$(BUILD_VERSION) +ICON = transfer.png +DESCRIPTION = "Variable Transfer Program $(FULL_VERSION)" +COMPRESSED = YES +ARCHIVED = YES -FLAGS ?= -Wall -Wextra -Oz -DVERSION='"$(FULL_VERSION)"' -CFLAGS ?= $(FLAGS) -CXXFLAGS ?= $(FLAGS) +FLAGS = -Wall -Wextra -Oz -DVERSION='"$(FULL_VERSION)"' +CFLAGS = $(FLAGS) +CXXFLAGS = $(FLAGS) -EXTRA_CSOURCES ?= src/font.c -EXTRA_USERHEADERS ?= src/ti84pceg.inc src/font.h -EXTRA_CLEAN ?= src/font.c src/font.h font/genfont +EXTRA_CSOURCES = src/font.c +EXTRA_USERHEADERS = src/ti84pceg.inc src/font.h +EXTRA_CLEAN = src/font.c src/font.h font/genfont # ---------------------------- -ifndef CEDEV -$(error CEDEV environment path variable is not set) -endif - -include $(CEDEV)/meta/makefile.mk +include $(shell cedev-config --makefile) all: $(Q)echo [done] prgm$(NAME) $(FULL_VERSION) @@ -49,4 +45,4 @@ src/font.h src/font.c: font/genfont makefile font/genfont: font/genfont.c makefile $(Q)echo [compiling] $< - $(Q)$(CC) -O3 -flto $< `pkg-config --cflags --libs freetype2` -o $@ + $(Q)$(NATIVECC) -O3 -flto $< `pkg-config --cflags --libs freetype2` -o $@ diff --git a/src/main.c b/src/main.c index 292596f..3499fb3 100644 --- a/src/main.c +++ b/src/main.c @@ -1181,6 +1181,7 @@ static int send_object( version = entry->version; flag = entry->flag; } + (void)version; flag &= global->transaction.pending .send_object.mask; flag |= global->transaction.pending