Revision 9fe6de94

b/Makefile
114 114

  
115 115
simpletrace.o: simpletrace.c $(GENERATED_HEADERS)
116 116

  
117
version.o: $(SRC_PATH)/version.rc config-host.mak
118
	$(call quiet-command,$(WINDRES) -I. -o $@ $<,"  RC    $(TARGET_DIR)$@")
119

  
120
version-obj-$(CONFIG_WIN32) += version.o
117 121
######################################################################
118 122

  
119 123
qemu-img.o: qemu-img-cmds.h
120 124
qemu-img.o qemu-tool.o qemu-nbd.o qemu-io.o: $(GENERATED_HEADERS)
121 125

  
122
qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y)
126
qemu-img$(EXESUF): qemu-img.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y)
123 127

  
124
qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y)
128
qemu-nbd$(EXESUF): qemu-nbd.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y)
125 129

  
126
qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y)
130
qemu-io$(EXESUF): qemu-io.o cmd.o qemu-tool.o qemu-error.o $(trace-obj-y) $(block-obj-y) $(qobject-obj-y) $(version-obj-y)
127 131

  
128 132
qemu-img-cmds.h: $(SRC_PATH)/qemu-img-cmds.hx
129 133
	$(call quiet-command,sh $(SRC_PATH)/hxtool -h < $< > $@,"  GEN   $@")
b/Makefile.objs
86 86

  
87 87
common-obj-$(CONFIG_BRLAPI) += baum.o
88 88
common-obj-$(CONFIG_POSIX) += migration-exec.o migration-unix.o migration-fd.o
89
common-obj-$(CONFIG_WIN32) += version.o
89 90

  
90 91
audio-obj-y = audio.o noaudio.o wavaudio.o mixeng.o
91 92
audio-obj-$(CONFIG_SDL) += sdlaudio.o
b/configure
83 83
objcopy="objcopy"
84 84
ld="ld"
85 85
strip="strip"
86
windres="windres"
86 87
helper_cflags=""
87 88
libs_softmmu=""
88 89
libs_tools=""
......
129 130
objcopy="${cross_prefix}${objcopy}"
130 131
ld="${cross_prefix}${ld}"
131 132
strip="${cross_prefix}${strip}"
133
windres="${cross_prefix}${windres}"
132 134

  
133 135
# default flags for all hosts
134 136
QEMU_CFLAGS="-fno-strict-aliasing $QEMU_CFLAGS"
......
2319 2321
echo "HOST_LONG_BITS=$hostlongbits" >> $config_host_mak
2320 2322
if test "$mingw32" = "yes" ; then
2321 2323
  echo "CONFIG_WIN32=y" >> $config_host_mak
2324
  rc_version=`cat $source_path/VERSION`
2325
  version_major=${rc_version%%.*}
2326
  rc_version=${rc_version#*.}
2327
  version_minor=${rc_version%%.*}
2328
  rc_version=${rc_version#*.}
2329
  version_subminor=${rc_version%%.*}
2330
  version_micro=0
2331
  echo "CONFIG_FILEVERSION=$version_major,$version_minor,$version_subminor,$version_micro" >> $config_host_mak
2332
  echo "CONFIG_PRODUCTVERSION=$version_major,$version_minor,$version_subminor,$version_micro" >> $config_host_mak
2322 2333
else
2323 2334
  echo "CONFIG_POSIX=y" >> $config_host_mak
2324 2335
fi
......
2565 2576
echo "AR=$ar" >> $config_host_mak
2566 2577
echo "OBJCOPY=$objcopy" >> $config_host_mak
2567 2578
echo "LD=$ld" >> $config_host_mak
2579
echo "WINDRES=$windres" >> $config_host_mak
2568 2580
echo "CFLAGS=$CFLAGS" >> $config_host_mak
2569 2581
echo "QEMU_CFLAGS=$QEMU_CFLAGS" >> $config_host_mak
2570 2582
echo "HELPER_CFLAGS=$helper_cflags" >> $config_host_mak
b/version.rc
1
#include <winver.h>
2
#include "config-host.h"
3

  
4
VS_VERSION_INFO VERSIONINFO
5
FILEVERSION CONFIG_FILEVERSION
6
PRODUCTVERSION CONFIG_PRODUCTVERSION
7
FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
8
FILEOS VOS_NT_WINDOWS32
9
FILETYPE VFT_APP
10
FILESUBTYPE VFT2_UNKNOWN
11
{
12
  BLOCK "StringFileInfo"
13
  {
14
    BLOCK "040904E4"
15
    {
16
      VALUE "CompanyName", "http://www.qemu.org"
17
      VALUE "FileDescription", "QEMU machine emulators and tools"
18
      VALUE "FileVersion", QEMU_VERSION
19
      VALUE "LegalCopyright", "Copyright various authors. Released under the GNU General Public License."
20
      VALUE "LegalTrademarks", "QEMU is a trademark of Fabrice Bellard."
21
      VALUE "ProductName", "QEMU"
22
    }
23
  }
24
  BLOCK "VarFileInfo"
25
  {
26
    VALUE "Translation", 0x0409, 1252
27
  }
28
}

Also available in: Unified diff