diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-08-29 17:20:17 -0500 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-08-29 17:20:17 -0500 |
| commit | e560992f21437380857ae490c907810d99459df5 (patch) | |
| tree | e4ddf08d084fa92df9c903c523accf706a954d3c | |
| parent | 3e998a778846de4ea24188278f18e4191a56412e (diff) | |
| parent | 92f1623663a8797e68a043ec401a740746439f29 (diff) | |
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: Anthony Liguori <anthony@codemonkey.ws>
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | ui/gtk.c | 4 | ||||
| -rw-r--r-- | version.rc | 2 |
3 files changed, 4 insertions, 4 deletions
@@ -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) @@ -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" diff --git a/version.rc b/version.rc index 82e10ecf26..a50d62fa0c 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" |