Re: [Qemu-devel] [PATCH] Better version.rc patch

["C.W. Betts" <computers57@hotmail.com>]

[-- Attachment #1: Type: text/plain, Size: 2455 bytes --]

Another patch.  Thank you for your patience.
Index: Makefile.target
===================================================================
RCS file: /sources/qemu/qemu/Makefile.target,v
retrieving revision 1.244
diff -u -r1.244 Makefile.target
--- Makefile.target 3 Feb 2008 02:20:17 -0000 1.244
+++ Makefile.target 8 Feb 2008 22:48:27 -0000
@@ -638,6 +638,7 @@

 ifdef CONFIG_WIN32
 SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole
+OBJS+=version.o
 endif

 # profiling code
@@ -654,6 +655,9 @@
 %.o: %.c
  $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<

+%.o: %.rc
+ windres -I. -c -o $< $@
+
 %.o: %.S
  $(CC) $(CPPFLAGS) -c -o $@ $<

Index: configure
===================================================================
RCS file: /sources/qemu/qemu/configure,v
retrieving revision 1.187
diff -u -r1.187 configure
--- configure 3 Feb 2008 19:20:13 -0000 1.187
+++ configure 8 Feb 2008 22:48:30 -0000
@@ -1065,6 +1065,10 @@
 echo "# Automatically generated by configure - do not modify" > $config_mak
 echo "/* Automatically generated by configure - do not modify */" > 
$config_h

+if test "$mingw32" = "yes" ; then
+echo "#define QEMU_FILEVERSION 0,9,1,0" >> $config_h
+echo "#define QEMU_PRODUCTVERSION 0,9,1,0" >> $config_h
+fi

 echo "include ../config-host.mak" >> $config_mak
 echo "#include \"../config-host.h\"" >> $config_h
0a1,22
> #include "config.h"
>
> 1 VERSIONINFO
> FILEVERSION QEMU_FILEVERSION
> PRODUCTVERSION QEMU_PRODUCTVERSION
> FILETYPE 0x1 //VFT_APP
>  {
> BLOCK "StringFileInfo"
>   {
>   BLOCK "040904E4"
>   {
>    VALUE "FileDescription", "Qemu System emulator, " TARGET_ARCH " 
> version"
>    VALUE "FileVersion", QEMU_VERSION
>    VALUE "LegalCopyright", "GNU General Public License"
>    VALUE "ProductName", "Qemu"
>   }
>  }
> BLOCK "VarFileInfo"
>  {
>   VALUE "Translation", 0x0409, 1252
>  }
> }

----- Original Message ----- 
From: "Johannes Schindelin" <Johannes.Schindelin@gmx.de>
To: "C.W. Betts" <computers57@hotmail.com>
Cc: <qemu-devel@nongnu.org>
Sent: Friday, February 08, 2008 1:49 PM
Subject: Re: [Qemu-devel] [PATCH] Better version.rc patch


> Hi,
>
> On Fri, 8 Feb 2008, C.W. Betts wrote:
>
>
> It is _still_ a hassle to review your patch, since you did not inline it
> again.
Sorry.  I'm new.
>
> Also, it seems as you have yet another line which is commented out, with a
> comment "currently not working".  I'd appreciate it if it was left out, or
> fixed.
As I said, I'm new.
> Hth,
> Dscho
>
>
>
> 

[-- Attachment #2: versionrc.diff --]
[-- Type: application/octet-stream, Size: 2024 bytes --]

? bxversion.rc
? qemuversion.rc.in
? version.rc
? versionrc.diff
? hw/ppc_actualrom
? hw/ppc_actualrom.c
? pc-bios/g3.rom
Index: Makefile.target
===================================================================
RCS file: /sources/qemu/qemu/Makefile.target,v
retrieving revision 1.244
diff -u -r1.244 Makefile.target
--- Makefile.target	3 Feb 2008 02:20:17 -0000	1.244
+++ Makefile.target	8 Feb 2008 22:48:27 -0000
@@ -638,6 +638,7 @@
 
 ifdef CONFIG_WIN32
 SDL_LIBS := $(filter-out -mwindows, $(SDL_LIBS)) -mconsole
+OBJS+=version.o
 endif
 
 # profiling code
@@ -654,6 +655,9 @@
 %.o: %.c
 	$(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
+%.o: %.rc
+	windres -I. -DORIGINAL_FILENAME=\"$(QEMU_PROG)\" -c -o $< $@
+
 %.o: %.S
 	$(CC) $(CPPFLAGS) -c -o $@ $<
 
Index: configure
===================================================================
RCS file: /sources/qemu/qemu/configure,v
retrieving revision 1.187
diff -u -r1.187 configure
--- configure	3 Feb 2008 19:20:13 -0000	1.187
+++ configure	8 Feb 2008 22:48:30 -0000
@@ -1065,6 +1065,10 @@
 echo "# Automatically generated by configure - do not modify" > $config_mak
 echo "/* Automatically generated by configure - do not modify */" > $config_h
 
+if test "$mingw32" = "yes" ; then
+echo "#define QEMU_FILEVERSION 0,9,1,0" >> $config_h
+echo "#define QEMU_PRODUCTVERSION 0,9,1,0" >> $config_h
+fi
 
 echo "include ../config-host.mak" >> $config_mak
 echo "#include \"../config-host.h\"" >> $config_h
0a1,22
> #include "config.h"
> 
> 1 VERSIONINFO
> FILEVERSION QEMU_FILEVERSION
> PRODUCTVERSION QEMU_PRODUCTVERSION
> FILETYPE 0x1 //VFT_APP
>  {
> BLOCK "StringFileInfo"
>   {
>   BLOCK "040904E4"
>   {
>    VALUE "FileDescription", "Qemu System emulator, " TARGET_ARCH " version"
>    VALUE "FileVersion", QEMU_VERSION
>    VALUE "LegalCopyright", "GNU General Public License"
>    VALUE "ProductName", "Qemu"
>   }
>  }
> BLOCK "VarFileInfo"
>  {
>   VALUE "Translation", 0x0409, 1252
>  }
> }