diff options
| author | Björn Stenberg <bjorn@haxx.se> | 2002-07-15 13:19:00 +0000 |
|---|---|---|
| committer | Björn Stenberg <bjorn@haxx.se> | 2002-07-15 13:19:00 +0000 |
| commit | 6d55a71e0e69926564be060cea61266739b372f4 (patch) | |
| tree | 75653fffecb6524dfdb2cfa09767a9a09a379934 | |
| parent | 803f47b8afb1fb48f345f447ef3144fac042b8f1 (diff) | |
| download | rockbox-6d55a71e0e69926564be060cea61266739b372f4.zip rockbox-6d55a71e0e69926564be060cea61266739b372f4.tar.gz rockbox-6d55a71e0e69926564be060cea61266739b372f4.tar.bz2 rockbox-6d55a71e0e69926564be060cea61266739b372f4.tar.xz | |
Added build timestamp in version string
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@1349 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/Makefile | 2 | ||||
| -rwxr-xr-x | tools/configure | 7 | ||||
| -rw-r--r-- | uisimulator/x11/Makefile | 10 |
3 files changed, 10 insertions, 9 deletions
diff --git a/apps/Makefile b/apps/Makefile index b2880fb..3629813 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -25,7 +25,7 @@ TARGET = -DARCHOS_PLAYER_OLD=1 # store output files in this directory: OBJDIR = . -CFLAGS = -O -W -Wall -m1 -nostdlib -Wstrict-prototypes -fomit-frame-pointer -fschedule-insns $(INCLUDES) $(TARGET) $(DEFINES) +CFLAGS = -O -W -Wall -m1 -nostdlib -Wstrict-prototypes -fomit-frame-pointer -fschedule-insns $(INCLUDES) $(TARGET) $(DEFINES) -DAPPSVERSION=\"$(VERSION)\" AFLAGS += -small -relax ifdef DEBUG diff --git a/tools/configure b/tools/configure index 0464150..b83a347 100755 --- a/tools/configure +++ b/tools/configure @@ -53,13 +53,14 @@ TARGET=@TARGET@ DISPLAY=@DISPLAY@ KEYPAD=@KEYPAD@ THISDIR="@PWD@" +VERSION=\$(shell date +%y%m%d-%H%M) .PHONE: all: sim sim: - make -C \$(SIMDIR) DISPLAY=\$(DISPLAY) KEYPAD=\$(KEYPAD) OBJDIR=\$(THISDIR) + make -C \$(SIMDIR) DISPLAY=\$(DISPLAY) KEYPAD=\$(KEYPAD) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) clean-sim: make -C \$(SIMDIR) DISPLAY=\$(DISPLAY) KEYPAD=\$(KEYPAD) OBJDIR=\$(THISDIR) clean @@ -150,7 +151,6 @@ if [ -z "$target" ]; then esac fi - if [ -z "$debug" ]; then ################################################################## # Figure out debug on/off @@ -235,6 +235,7 @@ APPSDIR=@APPSDIR@ DEBUG=@DEBUG@ TARGET=@TARGET@ THISDIR="@PWD@" +VERSION=\$(shell date +%y%m%d-%H%M) .PHONE: firmware apps @@ -244,7 +245,7 @@ firmware: make -C \$(FIRMDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) apps: - make -C \$(APPSDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) + make -C \$(APPSDIR) TARGET=\$(TARGET) \$(DEBUG) OBJDIR=\$(THISDIR) VERSION=\$(VERSION) clean-firmware: make -C \$(FIRMDIR) TARGET=\$(TARGET) OBJDIR=\$(THISDIR) clean diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile index 73d46bf..0c82b2d 100644 --- a/uisimulator/x11/Makefile +++ b/uisimulator/x11/Makefile @@ -42,7 +42,7 @@ DISPLAY = -DHAVE_LCD_BITMAP KEYPAD = -DHAVE_RECORDER_KEYPAD DEFINES = -DHAVE_CONFIG_H -DGETTIMEOFDAY_TWO_ARGS -DSIMULATOR \ -$(KEYPAD) $(DISPLAY) +$(KEYPAD) $(DISPLAY) LDFLAGS = -lX11 -lm -lXt -lXmu -lnsl @@ -71,7 +71,7 @@ endif CFLAGS = $(DEBUG) $(DEFINES) $(INCLUDES) -W -Wall -APPCFLAGS = $(DEBUG) $(DEFINES) $(APPINCLUDES) -W -Wall +APPCFLAGS = $(DEBUG) $(DEFINES) -DAPPSVERSION=\"$(VERSION)\" $(APPINCLUDES) -W -Wall FIRMSRCS = chartables.c lcd.c sprintf.c id3.c debug.c usb.c mpeg.c @@ -198,7 +198,7 @@ $(OBJDIR)/showtext.o: $(APPDIR)/showtext.c $(CC) $(APPCFLAGS) -c $< -o $@ $(OBJDIR)/lcd.o: $(DRIVERS)/lcd.c - $(CC) $(APPCFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) -c $< -o $@ $(OBJDIR)/chartables.o: $(FIRMWAREDIR)/chartables.c $(CC) $(APPCFLAGS) -c $< -o $@ @@ -216,10 +216,10 @@ $(OBJDIR)/mpeg.o: $(FIRMWAREDIR)/mpeg.c $(CC) $(CFLAGS) -c $< -o $@ $(OBJDIR)/sprintf.o: $(COMMON)/sprintf.c - $(CC) $(APPCFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) -c $< -o $@ $(OBJDIR)/usb.o: $(FIRMWAREDIR)/usb.c - $(CC) $(APPCFLAGS) -c $< -o $@ + $(CC) $(CFLAGS) -c $< -o $@ # these ones are simulator-specific |