hw/xwin: Link with libdxguid rather than defining the DirectX GUIDs ourselves
Decruftify by linking with libdxguid rather than defining the DirectX GUIDs ourselves. This fixes compilation with MinGW-w64 w32api headers, which do not provide GUID_SECT (which only ever did anything for gcc prior to 2.95, anyhow) Signed-off-by: Jon TURNEY <jon.turney@dronecode.org.uk> Reviewed-by: Colin Harrison <colin.harrison@virgin.net>
This commit is contained in:
parent
53830281b4
commit
5bc4c53d23
|
@ -147,6 +147,8 @@ XWin_SOURCES = $(SRCS)
|
||||||
|
|
||||||
INCLUDES = -I$(top_srcdir)/miext/rootless
|
INCLUDES = -I$(top_srcdir)/miext/rootless
|
||||||
|
|
||||||
|
XWIN_SYS_LIBS += -ldxguid
|
||||||
|
|
||||||
XWin_DEPENDENCIES = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS)
|
XWin_DEPENDENCIES = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS)
|
||||||
XWin_LDADD = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_GLX_LINK_FLAGS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS)
|
XWin_LDADD = $(MULTIWINDOWEXTWM_LIBS) $(XWIN_GLX_LIBS) $(XWIN_GLX_LINK_FLAGS) $(XWIN_LIBS) $(MAIN_LIB) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XWIN_SYS_LIBS)
|
||||||
XWin_LDFLAGS = -mwindows -static
|
XWin_LDFLAGS = -mwindows -static
|
||||||
|
|
|
@ -36,24 +36,6 @@
|
||||||
#endif
|
#endif
|
||||||
#include "win.h"
|
#include "win.h"
|
||||||
|
|
||||||
/*
|
|
||||||
* FIXME: Headers are broken, DEFINE_GUID doesn't work correctly,
|
|
||||||
* so we have to redefine it here.
|
|
||||||
*/
|
|
||||||
#ifdef DEFINE_GUID
|
|
||||||
#undef DEFINE_GUID
|
|
||||||
#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const GUID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
|
|
||||||
#endif /* DEFINE_GUID */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* FIXME: Headers are broken, IID_IDirectDraw2 has to be defined
|
|
||||||
* here manually. Should be handled by ddraw.h
|
|
||||||
*/
|
|
||||||
#ifndef IID_IDirectDraw2
|
|
||||||
DEFINE_GUID(IID_IDirectDraw2, 0xB3A6F3E0, 0x2B43, 0x11CF, 0xA2, 0xDE, 0x00,
|
|
||||||
0xAA, 0x00, 0xB9, 0x33, 0x56);
|
|
||||||
#endif /* IID_IDirectDraw2 */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Local prototypes
|
* Local prototypes
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -36,24 +36,6 @@
|
||||||
#endif
|
#endif
|
||||||
#include "win.h"
|
#include "win.h"
|
||||||
|
|
||||||
/*
|
|
||||||
* FIXME: Headers are broken, DEFINE_GUID doesn't work correctly,
|
|
||||||
* so we have to redefine it here.
|
|
||||||
*/
|
|
||||||
#ifdef DEFINE_GUID
|
|
||||||
#undef DEFINE_GUID
|
|
||||||
#define DEFINE_GUID(n,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) const GUID n GUID_SECT = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
|
|
||||||
#endif /* DEFINE_GUID */
|
|
||||||
|
|
||||||
/*
|
|
||||||
* FIXME: Headers are broken, IID_IDirectDraw4 has to be defined
|
|
||||||
* here manually. Should be handled by ddraw.h
|
|
||||||
*/
|
|
||||||
#ifndef IID_IDirectDraw4
|
|
||||||
DEFINE_GUID(IID_IDirectDraw4, 0x9c59509a, 0x39bd, 0x11d1, 0x8c, 0x4a, 0x00,
|
|
||||||
0xc0, 0x4f, 0xd9, 0x30, 0xc5);
|
|
||||||
#endif /* IID_IDirectDraw4 */
|
|
||||||
|
|
||||||
#define FAIL_MSG_MAX_BLT 10
|
#define FAIL_MSG_MAX_BLT 10
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in New Issue
Block a user