Merge remote-tracking branch 'sweil/mingw' into stable-1.5

# By Stefan Weil
# Via Stefan Weil
* sweil/mingw:
  gtk: Remove unused include statements which are not portable
  w32: Add an icon resource
  w32: Fix broken out-of-tree builds (missing version.o)

Message-id: 1377607132-21336-1-git-send-email-sw@weilnetz.de
Signed-off-by: NAnthony Liguori <anthony@codemonkey.ws>

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)
 

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"

version.rc

@@ -26,3 +26,5 @@ FILESUBTYPE VFT2_UNKNOWN
     VALUE "Translation", 0x0409, 1252
   }
 }
+
+IDI_ICON1 ICON "pc-bios/qemu-nsis.ico"