summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2010-05-02 09:54:14 +0000
committerDave Chapman <dave@dchapman.com>2010-05-02 09:54:14 +0000
commit9de9b9dfbe6b00c63e44e5497718ae4fc77b8ffe (patch)
tree33912ccc6b73458cc8b76f9a93398aa0203ebb4d /utils
parentcdcca8775f5109cb7fdae8277c2f2a647d0ec8d9 (diff)
downloadrockbox-9de9b9dfbe6b00c63e44e5497718ae4fc77b8ffe.tar.gz
rockbox-9de9b9dfbe6b00c63e44e5497718ae4fc77b8ffe.tar.bz2
rockbox-9de9b9dfbe6b00c63e44e5497718ae4fc77b8ffe.zip
Take version number from SVN, or via VERSION variable in Makefile - i.e. use "make VERSION=v1.0" to build with that version number.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25774 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'utils')
-rw-r--r--utils/tcctool/Makefile6
-rw-r--r--utils/tcctool/tcctool.c4
2 files changed, 6 insertions, 4 deletions
diff --git a/utils/tcctool/Makefile b/utils/tcctool/Makefile
index 4e1ec476ab..7258f2f8cd 100644
--- a/utils/tcctool/Makefile
+++ b/utils/tcctool/Makefile
@@ -1,7 +1,11 @@
# This contains the file to upload
ROMFILE=player.rom
-CFLAGS=-Wall -W -I/usr/local/include
+ifndef VERSION
+VERSION=$(shell ../../tools/version.sh)
+endif
+
+CFLAGS=-Wall -W -I/usr/local/include -DVERSION=\"$(VERSION)\"
ifeq ($(findstring CYGWIN,$(shell uname)),CYGWIN)
OUTPUT=tcctool.exe
diff --git a/utils/tcctool/tcctool.c b/utils/tcctool/tcctool.c
index a1d1b70dbc..9fd9863e8a 100644
--- a/utils/tcctool/tcctool.c
+++ b/utils/tcctool/tcctool.c
@@ -34,8 +34,6 @@
#include <unistd.h>
#include <fcntl.h>
-#define VERSION "0.1"
-
#define MAX_FIRMWARESIZE (10*1024*1024) /* Arbitrary limit (for safety) */
/* For win32 compatibility: */
@@ -265,7 +263,7 @@ int main(int argc, char* argv[])
int fd;
int device;
- printf("tcctool v" VERSION " - (C) 2007 Dave Chapman\n");
+ printf("tcctool " VERSION " - (C) 2007-2010 Dave Chapman\n");
printf("This is free software; see the source for copying conditions. There is NO\n");
printf("warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n\n");