From 44df38242a1c6e277a6067948e70d1ccd756f926 Mon Sep 17 00:00:00 2001 From: Jason Woofenden Date: Wed, 9 Dec 2009 14:44:27 -0500 Subject: [PATCH] compile in version number from configure.ac --- Makefile.in | 4 ++-- args.c | 3 ++- main.c | 3 ++- vorconfig.h | 2 -- 4 files changed, 6 insertions(+), 6 deletions(-) mode change 100755 => 100644 vor.desktop.in diff --git a/Makefile.in b/Makefile.in index 61d5dfe..be51a0e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -84,13 +84,13 @@ $(my_objects): vorconfig.h font.@OBJEXT@: font.h -args.@OBJEXT@: args.h +args.@OBJEXT@: args.h config.h dust.@OBJEXT@: globals.h dust.h float.h mt.h file.@OBJEXT@: file.h common.h -main.@OBJEXT@: args.h common.h dust.h file.h float.h globals.h mt.h rocks.h score.h sprite.h sound.h autopilot.h +main.@OBJEXT@: args.h common.h config.h dust.h file.h float.h globals.h mt.h rocks.h score.h sprite.h sound.h autopilot.h mt.@OBJEXT@: mt.h diff --git a/args.c b/args.c index 4785bc6..2db9f50 100644 --- a/args.c +++ b/args.c @@ -2,6 +2,7 @@ #include #include #include "args.h" +#include "config.h" #include "vorconfig.h" // Look and Feel @@ -30,7 +31,7 @@ short_opt(char c, char *arg) case 'f': opt_fullscreen = 1; break; case 's': opt_sound = 0; break; case 'V': - printf("Variations on Rockdodger %s\n", VERSION); + printf("Variations on Rockdodger %s\n", PACKAGE_VERSION); exit(0); case '?': case 'h': return 0; diff --git a/main.c b/main.c index b7332c5..708a1fa 100644 --- a/main.c +++ b/main.c @@ -32,6 +32,7 @@ #include "args.h" #include "common.h" +#include "config.h" #include "vorconfig.h" #include "dust.h" #include "file.h" @@ -534,7 +535,7 @@ draw_title_page(void) x = (XSIZE-font_width(text))/2 + cos(fadetimer/4.5)*10; font_write(x,YSIZE-100 + cos(fadetimer/3)*5,text); - text = "Version " VERSION; + text = "Version " PACKAGE_VERSION; x = (XSIZE-font_width(text))/2 + sin(fadetimer/4.5)*10; font_write(x,YSIZE-50 + sin(fadetimer/2)*5,text); } diff --git a/vor.desktop.in b/vor.desktop.in old mode 100755 new mode 100644 diff --git a/vorconfig.h b/vorconfig.h index 402cbc2..870fe00 100644 --- a/vorconfig.h +++ b/vorconfig.h @@ -1,8 +1,6 @@ #ifndef VOR_CONFIG_H #define VOR_CONFIG_H -#define VERSION "0.5.4" - // screen size #define XSIZE 640 #define YSIZE 480 -- 1.7.10.4