Search
lxdream.org :: lxdream :: r738:0cbff49086b8
lxdream 0.9.1
released Jun 29
Download Now
changeset738:0cbff49086b8
parent737:7477adafe909
child739:46fa527d9fef
authornkeynes
dateTue Jul 15 06:47:49 2008 +0000 (11 years ago)
Record the SVN revision in the build
Rationalise the version/copyright strings a little as well.
src/Makefile.am
src/Makefile.in
src/checkver.pl
src/cocoaui/cocoa_win.c
src/cocoaui/cocoaui.c
src/gtkui/gtkcb.c
src/gtkui/gtkui.c
src/lxdream.h
src/main.c
1.1 --- a/src/Makefile.am Tue Jul 15 06:42:24 2008 +0000
1.2 +++ b/src/Makefile.am Tue Jul 15 06:47:49 2008 +0000
1.3 @@ -1,5 +1,5 @@
1.4 ## Process this file with automake to produce Makefile.in
1.5 -
1.6 +SVNVERSION=@SVNVERSION@
1.7 INCLUDES = \
1.8 -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
1.9 -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
1.10 @@ -11,16 +11,26 @@
1.11 noinst_PROGRAMS = gendec genglsl
1.12 check_PROGRAMS = test/testxlt
1.13
1.14 -EXTRA_DIST=drivers/genkeymap.pl
1.15 +
1.16 +EXTRA_DIST=drivers/genkeymap.pl checkver.pl
1.17 AM_CFLAGS = -D_ISOC99_SOURCE -D_BSD_SOURCE
1.18 +
1.19 +.PHONY: checkversion
1.20 +checkversion:
1.21 + @$(srcdir)/checkver.pl "$(VERSION)" "$(top_srcdir)" version.c
1.22 +
1.23 +version.c: checkversion
1.24 +
1.25 TESTS = test/testxlt
1.26 -BUILT_SOURCES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c pvr2/gl_slsrc.c drivers/mac_keymap.h
1.27 +BUILT_SOURCES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c pvr2/gl_slsrc.c drivers/mac_keymap.h version.c
1.28 +
1.29 +#all-am: checkversion
1.30
1.31 gendec_SOURCES = tools/gendec.c tools/gendec.h tools/insparse.c tools/actparse.c
1.32 genglsl_SOURCES = tools/genglsl.c
1.33
1.34 lxdream_SOURCES = \
1.35 - main.c config.c config.h lxdream.h dream.h gui.h cpu.h hook.h \
1.36 + main.c version.c config.c config.h lxdream.h dream.h gui.h cpu.h hook.h \
1.37 mem.c mem.h mmio.h watch.c \
1.38 asic.c asic.h clock.h serial.h \
1.39 syscall.c syscall.h bios.c dcload.c \
2.1 --- a/src/Makefile.in Tue Jul 15 06:42:24 2008 +0000
2.2 +++ b/src/Makefile.in Tue Jul 15 06:47:49 2008 +0000
2.3 @@ -90,49 +90,50 @@
2.4 am_genglsl_OBJECTS = genglsl.$(OBJEXT)
2.5 genglsl_OBJECTS = $(am_genglsl_OBJECTS)
2.6 genglsl_DEPENDENCIES = $(am__DEPENDENCIES_1)
2.7 -am__lxdream_SOURCES_DIST = main.c config.c config.h lxdream.h dream.h \
2.8 - gui.h cpu.h hook.h mem.c mem.h mmio.h watch.c asic.c asic.h \
2.9 - clock.h serial.h syscall.c syscall.h bios.c dcload.c \
2.10 - gdrom/ide.c gdrom/ide.h gdrom/packet.h gdrom/gdimage.c \
2.11 - gdrom/gdrom.c gdrom/gdrom.h gdrom/nrg.c gdrom/cdi.c \
2.12 - gdrom/gdi.c gdrom/edc_ecc.c gdrom/ecc.h gdrom/edc_crctable.h \
2.13 - gdrom/edc_encoder.h gdrom/edc_l2sq.h gdrom/edc_scramble.h \
2.14 - gdrom/mmc.c gdrom/gddriver.h dreamcast.c dreamcast.h eventq.c \
2.15 - eventq.h sh4/sh4.c sh4/intc.c sh4/intc.h sh4/sh4mem.c \
2.16 - sh4/timer.c sh4/dmac.c sh4/mmu.c sh4/sh4core.c sh4/sh4core.h \
2.17 - sh4/sh4dasm.c sh4/sh4dasm.h sh4/sh4mmio.c sh4/sh4mmio.h \
2.18 - sh4/scif.c sh4/sh4stat.c sh4/sh4stat.h sh4/xltcache.c \
2.19 - sh4/xltcache.h sh4/sh4.h sh4/dmac.h aica/armcore.c \
2.20 - aica/armcore.h aica/armdasm.c aica/armdasm.h aica/armmem.c \
2.21 - aica/aica.c aica/aica.h aica/audio.c aica/audio.h pvr2/pvr2.c \
2.22 - pvr2/pvr2.h pvr2/pvr2mem.c pvr2/pvr2mmio.h pvr2/tacore.c \
2.23 - pvr2/rendsort.c pvr2/texcache.c pvr2/yuv.c pvr2/rendsave.c \
2.24 - pvr2/scene.c pvr2/scene.h pvr2/gl_sl.c pvr2/gl_slsrc.c \
2.25 - pvr2/glutil.c pvr2/glutil.h pvr2/glrender.c pvr2/vertex.glsl \
2.26 - pvr2/fragment.glsl maple/maple.c maple/maple.h \
2.27 - maple/controller.c maple/controller.h maple/kbd.c \
2.28 - maple/mouse.c loader.c loader.h elf.h bootstrap.c bootstrap.h \
2.29 - util.c gdlist.c gdlist.h display.c display.h dckeysyms.h \
2.30 - drivers/audio_null.c drivers/video_null.c drivers/video_gl.c \
2.31 - drivers/video_gl.h drivers/gl_fbo.c sh4/sh4.def sh4/sh4core.in \
2.32 - sh4/sh4x86.in sh4/sh4dasm.in sh4/sh4stat.in sh4/sh4x86.c \
2.33 - sh4/x86op.h sh4/ia32abi.h sh4/ia32mac.h sh4/ia64abi.h \
2.34 - sh4/sh4trans.c sh4/sh4trans.h x86dasm/x86dasm.c \
2.35 - x86dasm/x86dasm.h x86dasm/i386-dis.c x86dasm/dis-init.c \
2.36 - x86dasm/dis-buf.c x86dasm/ansidecl.h x86dasm/bfd.h \
2.37 - x86dasm/config.h x86dasm/dis-asm.h x86dasm/opintl.h \
2.38 - x86dasm/symcat.h x86dasm/sysdep.h gtkui/gtkui.c gtkui/gtkui.h \
2.39 - gtkui/main_win.c gtkui/gtkcb.c gtkui/mmio_win.c \
2.40 - gtkui/debug_win.c gtkui/dump_win.c gtkui/ctrl_dlg.c \
2.41 - gtkui/path_dlg.c gtkui/gdrom_menu.c drivers/video_gtk.c \
2.42 - cocoaui/cocoaui.c cocoaui/cocoaui.h cocoaui/cocoa_win.c \
2.43 - cocoaui/cocoa_gd.c cocoaui/cocoa_prefs.c drivers/video_osx.c \
2.44 - drivers/mac_keymap.h drivers/mac_keymap.txt \
2.45 - drivers/video_gdk.c drivers/video_glx.c drivers/video_glx.h \
2.46 - drivers/video_nsgl.c drivers/video_nsgl.h drivers/audio_osx.c \
2.47 - drivers/audio_pulse.c drivers/audio_esd.c drivers/audio_alsa.c \
2.48 - drivers/cd_linux.c drivers/cd_osx.c drivers/osx_iokit.c \
2.49 - drivers/osx_iokit.h drivers/cd_none.c drivers/joy_linux.c
2.50 +am__lxdream_SOURCES_DIST = main.c version.c config.c config.h \
2.51 + lxdream.h dream.h gui.h cpu.h hook.h mem.c mem.h mmio.h \
2.52 + watch.c asic.c asic.h clock.h serial.h syscall.c syscall.h \
2.53 + bios.c dcload.c gdrom/ide.c gdrom/ide.h gdrom/packet.h \
2.54 + gdrom/gdimage.c gdrom/gdrom.c gdrom/gdrom.h gdrom/nrg.c \
2.55 + gdrom/cdi.c gdrom/gdi.c gdrom/edc_ecc.c gdrom/ecc.h \
2.56 + gdrom/edc_crctable.h gdrom/edc_encoder.h gdrom/edc_l2sq.h \
2.57 + gdrom/edc_scramble.h gdrom/mmc.c gdrom/gddriver.h dreamcast.c \
2.58 + dreamcast.h eventq.c eventq.h sh4/sh4.c sh4/intc.c sh4/intc.h \
2.59 + sh4/sh4mem.c sh4/timer.c sh4/dmac.c sh4/mmu.c sh4/sh4core.c \
2.60 + sh4/sh4core.h sh4/sh4dasm.c sh4/sh4dasm.h sh4/sh4mmio.c \
2.61 + sh4/sh4mmio.h sh4/scif.c sh4/sh4stat.c sh4/sh4stat.h \
2.62 + sh4/xltcache.c sh4/xltcache.h sh4/sh4.h sh4/dmac.h \
2.63 + aica/armcore.c aica/armcore.h aica/armdasm.c aica/armdasm.h \
2.64 + aica/armmem.c aica/aica.c aica/aica.h aica/audio.c \
2.65 + aica/audio.h pvr2/pvr2.c pvr2/pvr2.h pvr2/pvr2mem.c \
2.66 + pvr2/pvr2mmio.h pvr2/tacore.c pvr2/rendsort.c pvr2/texcache.c \
2.67 + pvr2/yuv.c pvr2/rendsave.c pvr2/scene.c pvr2/scene.h \
2.68 + pvr2/gl_sl.c pvr2/gl_slsrc.c pvr2/glutil.c pvr2/glutil.h \
2.69 + pvr2/glrender.c pvr2/vertex.glsl pvr2/fragment.glsl \
2.70 + maple/maple.c maple/maple.h maple/controller.c \
2.71 + maple/controller.h maple/kbd.c maple/mouse.c loader.c loader.h \
2.72 + elf.h bootstrap.c bootstrap.h util.c gdlist.c gdlist.h \
2.73 + display.c display.h dckeysyms.h drivers/audio_null.c \
2.74 + drivers/video_null.c drivers/video_gl.c drivers/video_gl.h \
2.75 + drivers/gl_fbo.c sh4/sh4.def sh4/sh4core.in sh4/sh4x86.in \
2.76 + sh4/sh4dasm.in sh4/sh4stat.in sh4/sh4x86.c sh4/x86op.h \
2.77 + sh4/ia32abi.h sh4/ia32mac.h sh4/ia64abi.h sh4/sh4trans.c \
2.78 + sh4/sh4trans.h x86dasm/x86dasm.c x86dasm/x86dasm.h \
2.79 + x86dasm/i386-dis.c x86dasm/dis-init.c x86dasm/dis-buf.c \
2.80 + x86dasm/ansidecl.h x86dasm/bfd.h x86dasm/config.h \
2.81 + x86dasm/dis-asm.h x86dasm/opintl.h x86dasm/symcat.h \
2.82 + x86dasm/sysdep.h gtkui/gtkui.c gtkui/gtkui.h gtkui/main_win.c \
2.83 + gtkui/gtkcb.c gtkui/mmio_win.c gtkui/debug_win.c \
2.84 + gtkui/dump_win.c gtkui/ctrl_dlg.c gtkui/path_dlg.c \
2.85 + gtkui/gdrom_menu.c drivers/video_gtk.c cocoaui/cocoaui.c \
2.86 + cocoaui/cocoaui.h cocoaui/cocoa_win.c cocoaui/cocoa_gd.c \
2.87 + cocoaui/cocoa_prefs.c drivers/video_osx.c drivers/mac_keymap.h \
2.88 + drivers/mac_keymap.txt drivers/video_gdk.c drivers/video_glx.c \
2.89 + drivers/video_glx.h drivers/video_nsgl.c drivers/video_nsgl.h \
2.90 + drivers/audio_osx.c drivers/audio_pulse.c drivers/audio_esd.c \
2.91 + drivers/audio_alsa.c drivers/cd_linux.c drivers/cd_osx.c \
2.92 + drivers/osx_iokit.c drivers/osx_iokit.h drivers/cd_none.c \
2.93 + drivers/joy_linux.c
2.94 @BUILD_SH4X86_TRUE@am__objects_1 = sh4x86.$(OBJEXT) sh4trans.$(OBJEXT) \
2.95 @BUILD_SH4X86_TRUE@ x86dasm.$(OBJEXT) i386-dis.$(OBJEXT) \
2.96 @BUILD_SH4X86_TRUE@ dis-init.$(OBJEXT) dis-buf.$(OBJEXT)
2.97 @@ -155,8 +156,8 @@
2.98 @CDROM_OSX_TRUE@am__objects_12 = cd_osx.$(OBJEXT) osx_iokit.$(OBJEXT)
2.99 @CDROM_NONE_TRUE@am__objects_13 = cd_none.$(OBJEXT)
2.100 @JOY_LINUX_TRUE@am__objects_14 = joy_linux.$(OBJEXT)
2.101 -am_lxdream_OBJECTS = main.$(OBJEXT) config.$(OBJEXT) mem.$(OBJEXT) \
2.102 - watch.$(OBJEXT) asic.$(OBJEXT) syscall.$(OBJEXT) \
2.103 +am_lxdream_OBJECTS = main.$(OBJEXT) version.$(OBJEXT) config.$(OBJEXT) \
2.104 + mem.$(OBJEXT) watch.$(OBJEXT) asic.$(OBJEXT) syscall.$(OBJEXT) \
2.105 bios.$(OBJEXT) dcload.$(OBJEXT) ide.$(OBJEXT) \
2.106 gdimage.$(OBJEXT) gdrom.$(OBJEXT) nrg.$(OBJEXT) cdi.$(OBJEXT) \
2.107 gdi.$(OBJEXT) edc_ecc.$(OBJEXT) mmc.$(OBJEXT) \
2.108 @@ -373,6 +374,7 @@
2.109 sharedstatedir = @sharedstatedir@
2.110 sysconfdir = @sysconfdir@
2.111 target_alias = @target_alias@
2.112 +SVNVERSION = @SVNVERSION@
2.113 INCLUDES = \
2.114 -DPACKAGE_DATA_DIR=\""$(datadir)"\" \
2.115 -DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
2.116 @@ -380,18 +382,20 @@
2.117 -Ish4 \
2.118 @GLIB_CFLAGS@ @GTK_CFLAGS@ @LIBPNG_CFLAGS@ @PULSE_CFLAGS@ @ESOUND_CFLAGS@ @ALSA_CFLAGS@
2.119
2.120 -EXTRA_DIST = drivers/genkeymap.pl
2.121 +EXTRA_DIST = drivers/genkeymap.pl checkver.pl
2.122 AM_CFLAGS = -D_ISOC99_SOURCE -D_BSD_SOURCE
2.123 TESTS = test/testxlt
2.124 -BUILT_SOURCES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c pvr2/gl_slsrc.c drivers/mac_keymap.h
2.125 +BUILT_SOURCES = sh4/sh4core.c sh4/sh4dasm.c sh4/sh4x86.c pvr2/gl_slsrc.c drivers/mac_keymap.h version.c
2.126 +
2.127 +#all-am: checkversion
2.128 gendec_SOURCES = tools/gendec.c tools/gendec.h tools/insparse.c tools/actparse.c
2.129 genglsl_SOURCES = tools/genglsl.c
2.130 -lxdream_SOURCES = main.c config.c config.h lxdream.h dream.h gui.h \
2.131 - cpu.h hook.h mem.c mem.h mmio.h watch.c asic.c asic.h clock.h \
2.132 - serial.h syscall.c syscall.h bios.c dcload.c gdrom/ide.c \
2.133 - gdrom/ide.h gdrom/packet.h gdrom/gdimage.c gdrom/gdrom.c \
2.134 - gdrom/gdrom.h gdrom/nrg.c gdrom/cdi.c gdrom/gdi.c \
2.135 - gdrom/edc_ecc.c gdrom/ecc.h gdrom/edc_crctable.h \
2.136 +lxdream_SOURCES = main.c version.c config.c config.h lxdream.h dream.h \
2.137 + gui.h cpu.h hook.h mem.c mem.h mmio.h watch.c asic.c asic.h \
2.138 + clock.h serial.h syscall.c syscall.h bios.c dcload.c \
2.139 + gdrom/ide.c gdrom/ide.h gdrom/packet.h gdrom/gdimage.c \
2.140 + gdrom/gdrom.c gdrom/gdrom.h gdrom/nrg.c gdrom/cdi.c \
2.141 + gdrom/gdi.c gdrom/edc_ecc.c gdrom/ecc.h gdrom/edc_crctable.h \
2.142 gdrom/edc_encoder.h gdrom/edc_l2sq.h gdrom/edc_scramble.h \
2.143 gdrom/mmc.c gdrom/gddriver.h dreamcast.c dreamcast.h eventq.c \
2.144 eventq.h sh4/sh4.c sh4/intc.c sh4/intc.h sh4/sh4mem.c \
2.145 @@ -604,6 +608,7 @@
2.146 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/texcache.Po@am__quote@
2.147 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/timer.Po@am__quote@
2.148 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/util.Po@am__quote@
2.149 +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/version.Po@am__quote@
2.150 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_gdk.Po@am__quote@
2.151 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_gl.Po@am__quote@
2.152 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/video_glx.Po@am__quote@
2.153 @@ -2056,6 +2061,12 @@
2.154 uninstall-am uninstall-binPROGRAMS uninstall-info-am
2.155
2.156
2.157 +.PHONY: checkversion
2.158 +checkversion:
2.159 + @$(srcdir)/checkver.pl "$(VERSION)" "$(top_srcdir)" version.c
2.160 +
2.161 +version.c: checkversion
2.162 +
2.163 sh4/sh4core.c: gendec sh4/sh4.def sh4/sh4core.in
2.164 mkdir -p `dirname $@`
2.165 ./gendec $(srcdir)/sh4/sh4.def $(srcdir)/sh4/sh4core.in -o $@
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/src/checkver.pl Tue Jul 15 06:47:49 2008 +0000
3.3 @@ -0,0 +1,39 @@
3.4 +#!/usr/bin/perl
3.5 +# Usage: updatever.pl <basever> <top_srcdir> <version file>
3.6 +
3.7 +my $svnversion = "svnversion";
3.8 +my $basever = $ARGV[0];
3.9 +my $top_srcdir = $ARGV[1];
3.10 +my $outfile = $ARGV[2];
3.11 +
3.12 +my $rev = "";
3.13 +my $full_ver = "$basever";
3.14 +
3.15 +if( $svnversion ) {
3.16 + $rev = `$svnversion "$top_srcdir"`;
3.17 + chomp $rev;
3.18 + if( $rev == "exported" ) {
3.19 + $rev = "";
3.20 + } else {
3.21 + $full_ver = "${basever}.${rev}";
3.22 + }
3.23 +}
3.24 +my $header = "/* Autogenerated by checkver.pl */";
3.25 +my $output = "${header}\n".
3.26 + "const char lxdream_package_name[] = \"lxdream $basever\";\n" .
3.27 + "const char lxdream_short_version[] = \"$basever\";\n" .
3.28 + "const char lxdream_full_version[] = \"$full_ver\";\n" .
3.29 + "const char lxdream_copyright[] = \"Copyright (C) 2005-2008 Nathan Keynes\";\n";
3.30 +
3.31 +my $oldfile = "";
3.32 +if( -e $outfile ) {
3.33 + open(VERSIONFILE, "<$outfile") || die "Unable to read from $outfile\n";
3.34 + $oldfile = join "", <VERSIONFILE>;
3.35 + close(VERSIONFILE);
3.36 +}
3.37 +
3.38 +if( $oldfile ne $output ) {
3.39 + open(VERSIONFILE, ">$outfile") || die "Unable to write to $outfile\n";
3.40 + print VERSIONFILE $output;
3.41 + close(VERSIONFILE);
3.42 +}
3.43 \ No newline at end of file
4.1 --- a/src/cocoaui/cocoa_win.c Tue Jul 15 06:42:24 2008 +0000
4.2 +++ b/src/cocoaui/cocoa_win.c Tue Jul 15 06:47:49 2008 +0000
4.3 @@ -135,7 +135,7 @@
4.4 [self setContentMinSize: contentRect.size];
4.5 [self setAcceptsMouseMovedEvents: YES];
4.6
4.7 - NSString *title = [[NSString alloc] initWithCString: (APP_NAME " " APP_VERSION) encoding: NSASCIIStringEncoding];
4.8 + NSString *title = [[NSString alloc] initWithCString: lxdream_package_name encoding: NSASCIIStringEncoding];
4.9 [self setTitle: title];
4.10
4.11 NSToolbar *toolbar = [[NSToolbar alloc] initWithIdentifier: @"LxdreamToolbar"];
5.1 --- a/src/cocoaui/cocoaui.c Tue Jul 15 06:42:24 2008 +0000
5.2 +++ b/src/cocoaui/cocoaui.c Tue Jul 15 06:47:49 2008 +0000
5.3 @@ -68,7 +68,7 @@
5.4 /* Add menu items */
5.5 title = [@"About " stringByAppendingString:appName];
5.6 [appleMenu addItemWithTitle:title action:@selector(about_action:) keyEquivalent:@""];
5.7 -
5.8 +
5.9 // [appleMenu addItem:[NSMenuItem separatorItem]];
5.10 // [appleMenu addItemWithTitle: NS_("Preferences...") action:@selector(preferences_action:) keyEquivalent:@","];
5.11
5.12 @@ -151,7 +151,7 @@
5.13 - (void) about_action: (id)sender
5.14 {
5.15 NSArray *keys = [NSArray arrayWithObjects: @"Version", @"Copyright", nil];
5.16 - NSArray *values = [NSArray arrayWithObjects: @APP_VERSION, @"Copyright (C) 2005-2008 Nathan Keynes", nil];
5.17 + NSArray *values = [NSArray arrayWithObjects: NS_(lxdream_full_version), NS_(lxdream_copyright), nil];
5.18
5.19 NSDictionary *options= [NSDictionary dictionaryWithObjects: values forKeys: keys];
5.20
6.1 --- a/src/gtkui/gtkcb.c Tue Jul 15 06:42:24 2008 +0000
6.2 +++ b/src/gtkui/gtkcb.c Tue Jul 15 06:47:49 2008 +0000
6.3 @@ -179,8 +179,8 @@
6.4
6.5 GtkWidget *dialog = g_object_new (GTK_TYPE_ABOUT_DIALOG,
6.6 "name", APP_NAME,
6.7 - "version", APP_VERSION,
6.8 - "copyright", "(C) 2003-2007 Nathan Keynes",
6.9 + "version", lxdream_full_version,
6.10 + "copyright", lxdream_copyright,
6.11 NULL);
6.12 gtk_window_set_modal(GTK_WINDOW(dialog), TRUE);
6.13 gtk_dialog_run(GTK_DIALOG(dialog));
6.14 @@ -228,7 +228,7 @@
6.15
6.16 void debug_memory_action_callback( GtkAction *action, gpointer user_data)
6.17 {
6.18 - gchar *title = g_strdup_printf( APP_NAME " " APP_VERSION " :: %s", _("Memory dump") );
6.19 + gchar *title = g_strdup_printf( "%s :: %s", lxdream_package_name, _("Memory dump") );
6.20 dump_window_new( title );
6.21 g_free(title);
6.22 }
7.1 --- a/src/gtkui/gtkui.c Tue Jul 15 06:42:24 2008 +0000
7.2 +++ b/src/gtkui/gtkui.c Tue Jul 15 06:47:49 2008 +0000
7.3 @@ -227,7 +227,7 @@
7.4 GtkWidget *gdrommenuitem = gtk_ui_manager_get_widget(global_ui_manager, "/MainMenu/FileMenu/GdromSettings");
7.5 GtkWidget *gdrommenu = gdrom_menu_new();
7.6 gtk_menu_item_set_submenu( GTK_MENU_ITEM(gdrommenuitem), gdrommenu );
7.7 - main_win = main_window_new( APP_NAME " " APP_VERSION, menubar, toolbar, accel_group );
7.8 + main_win = main_window_new( lxdream_package_name, menubar, toolbar, accel_group );
7.9 main_window_set_use_grab(main_win, TRUE);
7.10 if( withDebug ) {
7.11 gtk_gui_show_debugger();
7.12 @@ -290,7 +290,7 @@
7.13 GtkWidget *gdrommenuitem = gtk_ui_manager_get_widget(global_ui_manager, "/DebugMenu/FileMenu/GdromSettings");
7.14 GtkWidget *gdrommenu = gdrom_menu_new();
7.15 gtk_menu_item_set_submenu( GTK_MENU_ITEM(gdrommenuitem), gdrommenu );
7.16 - gchar *title = g_strdup_printf( APP_NAME " " APP_VERSION " :: %s", _("Debugger"));
7.17 + gchar *title = g_strdup_printf( "%s :: %s", lxdream_package_name, _("Debugger"));
7.18 debug_win = debug_window_new( title, menubar, toolbar, accel_group );
7.19 g_free(title);
7.20 }
7.21 @@ -301,7 +301,7 @@
7.22 if( mmio_win ) {
7.23 mmio_window_show(mmio_win, TRUE);
7.24 } else {
7.25 - gchar *title = g_strdup_printf( APP_NAME " " APP_VERSION " :: %s", _("MMIO Registers"));
7.26 + gchar *title = g_strdup_printf( "%s :: %s", lxdream_package_name, _("MMIO Registers"));
7.27 mmio_win = mmio_window_new( title );
7.28 g_free(title);
7.29 }
8.1 --- a/src/lxdream.h Tue Jul 15 06:42:24 2008 +0000
8.2 +++ b/src/lxdream.h Tue Jul 15 06:47:49 2008 +0000
8.3 @@ -28,8 +28,12 @@
8.4 extern "C" {
8.5 #endif
8.6
8.7 -#define APP_NAME "lxDream"
8.8 -#define APP_VERSION "0.8.3"
8.9 +#define APP_NAME PACKAGE
8.10 +extern const char lxdream_package_name[];
8.11 +extern const char lxdream_short_version[];
8.12 +extern const char lxdream_full_version[];
8.13 +extern const char lxdream_copyright[];
8.14 +
8.15
8.16 #define MB *1024*1024
8.17 #define KB *1024
9.1 --- a/src/main.c Tue Jul 15 06:42:24 2008 +0000
9.2 +++ b/src/main.c Tue Jul 15 06:47:49 2008 +0000
9.3 @@ -66,13 +66,13 @@
9.4
9.5 void print_version()
9.6 {
9.7 - printf( "lxdream " APP_VERSION "\n" );
9.8 + printf( "lxdream %s\n", lxdream_full_version );
9.9 }
9.10
9.11 void print_usage()
9.12 {
9.13 print_version();
9.14 - printf( "Usage: lxdream [options] [disc-file] [program-file]\n\n" );
9.15 + printf( "Usage: lxdream %s [options] [disc-file] [program-file]\n\n", lxdream_full_version );
9.16
9.17 printf( "Options:\n" );
9.18 printf( " -a, --aica=PROGFILE %s\n", _("Run the AICA SPU only, with the supplied program") );
.