[Qemu-commits] [qemu/qemu] 577a67: Makefile: add qga-vss-dll-obj-y to nested variable...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/qemu/qemu
  Commit: 577a67234dd7bef8b0443804f3a81977072f8657
      
https://github.com/qemu/qemu/commit/577a67234dd7bef8b0443804f3a81977072f8657
  Author: Tomoki Sekiyama <address@hidden>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    M Makefile

  Log Message:
  -----------
  Makefile: add qga-vss-dll-obj-y to nested variables

The build rule for qga/vss-win32/qga-vss.dll is broken by commit
ba1183da9a10b94611cad88c44a5c6df005f9b55, because it misses
qga-vss-dll-obj-y in the list of nested variables.
This fixes build of qga-vss.dll by adding qga-vss-dll-obj-y to the list.

Signed-off-by: Tomoki Sekiyama <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: 9854202b57e0ac197cf2bee3d7fbf79ba58f16c5
      
https://github.com/qemu/qemu/commit/9854202b57e0ac197cf2bee3d7fbf79ba58f16c5
  Author: Tomoki Sekiyama <address@hidden>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    M qga/vss-win32/install.cpp

  Log Message:
  -----------
  vss-win32: Fix build with mingw64-headers-3.1.0

In mingw64-headers-3.1.0, definition of _com_issue_error() is added, which
conflicts with definition in install.cpp. This adds version checking for
mingw headers to disable the definition when the headers>=3.1 is used.

Signed-off-by: Tomoki Sekiyama <address@hidden>
Signed-off-by: Michael Roth <address@hidden>


  Commit: e792933ce1a9229d01b00f02caa39c39c30bcce8
      
https://github.com/qemu/qemu/commit/e792933ce1a9229d01b00f02caa39c39c30bcce8
  Author: Peter Maydell <address@hidden>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M Makefile
    M qga/vss-win32/install.cpp

  Log Message:
  -----------
  Merge remote-tracking branch 'remotes/mdroth/qga-pull-2014-4-7' into staging

* remotes/mdroth/qga-pull-2014-4-7:
  vss-win32: Fix build with mingw64-headers-3.1.0
  Makefile: add qga-vss-dll-obj-y to nested variables

Signed-off-by: Peter Maydell <address@hidden>


Compare: https://github.com/qemu/qemu/compare/55519a4b244e...e792933ce1a9