[Qemu-devel] [PULL 0/3] w32: Fix build and other small improvements

[Qemu-devel] [PULL 0/3] w32: Fix build and other small improvements

[Stefan Weil]

The following changes since commit f7ad538e1ea130c8b6f3abb06ad6c856242c799e:

  Merge remote-tracking branch 'stefanha/block' into staging (2013-08-26 09:19:50 -0500)

are available in the git repository at:


  git://qemu.weilnetz.de/qemu.git mingw

for you to fetch changes up to 92f1623663a8797e68a043ec401a740746439f29:

  gtk: Remove unused include statements which are not portable (2013-08-27 14:21:16 +0200)

----------------------------------------------------------------
Stefan Weil (3):
      w32: Fix broken out-of-tree builds (missing version.o)
      w32: Add an icon resource
      gtk: Remove unused include statements which are not portable

 Makefile   |    2 ++
 ui/gtk.c   |    4 ----
 version.rc |    2 ++
 3 files changed, 4 insertions(+), 4 deletions(-)

[Qemu-devel] [PULL 1/3] w32: Fix broken out-of-tree builds (missing version.o)

[Stefan Weil]

Commit 0b516ef0dfad9a7b34c675c98e8ec92ab4d38466 added version.o to all
executables, but broke out-of-tree builds: for those builds the pattern
rule %.o: %.rc from rules.mak does not match, so version.o was no longer
built.

Adding explicit build rules fixes this.

Reported-by: Michael Roth <mdroth@linux.vnet.ibm.com>
Signed-off-by: Stefan Weil <sw@weilnetz.de>
Tested-by: Michael Roth <mdroth@linux.vnet.ibm.com>
---
 Makefile |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index 4d257f1..806946e 100644
--- a/Makefile
+++ b/Makefile
@@ -168,7 +168,9 @@ recurse-all: $(SUBDIR_RULES) $(ROMSUBDIR_RULES)
 bt-host.o: QEMU_CFLAGS += $(BLUEZ_CFLAGS)
 
 $(BUILD_DIR)/version.o: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h | $(BUILD_DIR)/version.lo
+	$(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<,"  RC    version.o")
 $(BUILD_DIR)/version.lo: $(SRC_PATH)/version.rc $(BUILD_DIR)/config-host.h
+	$(call quiet-command,$(WINDRES) -I$(BUILD_DIR) -o $@ $<,"  RC    version.lo")
 
 Makefile: $(version-obj-y) $(version-lobj-y)
 
-- 
1.7.10.4

[Qemu-devel] [PULL 2/3] w32: Add an icon resource

[Stefan Weil]

The QEMU mascot which was already used for the NSIS installer
is now used for all QEMU executables.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 version.rc |    2 ++
 1 file changed, 2 insertions(+)

diff --git a/version.rc b/version.rc
index 82e10ec..a50d62f 100644
--- a/version.rc
+++ b/version.rc
@@ -26,3 +26,5 @@ FILESUBTYPE VFT2_UNKNOWN
     VALUE "Translation", 0x0409, 1252
   }
 }
+
+IDI_ICON1 ICON "pc-bios/qemu-nsis.ico"
-- 
1.7.10.4

[Qemu-devel] [PULL 3/3] gtk: Remove unused include statements which are not portable

[Stefan Weil]

These include files don't exist for MinGW and are not needed for Linux
(and hopefully for other hosts as well), so remove them.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
---
 ui/gtk.c |    4 ----
 1 file changed, 4 deletions(-)

diff --git a/ui/gtk.c b/ui/gtk.c
index c38146f..b5f4f0b 100644
--- a/ui/gtk.c
+++ b/ui/gtk.c
@@ -51,10 +51,6 @@
 #include <glib/gi18n.h>
 #include <locale.h>
 #include <vte/vte.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/un.h>
-#include <sys/wait.h>
 #include <math.h>
 
 #include "ui/console.h"
-- 
1.7.10.4