diff options
author | Keith Packard <keithp@keithp.com> | 2015-05-11 15:36:53 -0700 |
---|---|---|
committer | Keith Packard <keithp@keithp.com> | 2015-05-11 15:36:53 -0700 |
commit | 26e50e8b2cbd01d050b5ecc02d47488b53ecc08b (patch) | |
tree | 2271c7e309aa22729948c63950bb650db3f12a33 /hw | |
parent | 28ff661e73f4bdf0a9b7c84e70fa0a08fd30e482 (diff) | |
parent | c7b49bdbb9321fe9a7dc35f47b91cac85516988f (diff) |
Merge remote-tracking branch 'jturney/mingw-build-fixes'
Diffstat (limited to 'hw')
-rw-r--r-- | hw/xnest/Keyboard.c | 4 | ||||
-rw-r--r-- | hw/xwin/winclipboard/Makefile.am | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/hw/xnest/Keyboard.c b/hw/xnest/Keyboard.c index 002885f4f..7ee7a7c3c 100644 --- a/hw/xnest/Keyboard.c +++ b/hw/xnest/Keyboard.c @@ -16,6 +16,10 @@ is" without express or implied warranty. #include <xnest-config.h> #endif +#ifdef WIN32 +#include <X11/Xwindows.h> +#endif + #include <X11/X.h> #include <X11/Xproto.h> #include <xcb/xcb_keysyms.h> diff --git a/hw/xwin/winclipboard/Makefile.am b/hw/xwin/winclipboard/Makefile.am index b1c95f4ef..a1079aec6 100644 --- a/hw/xwin/winclipboard/Makefile.am +++ b/hw/xwin/winclipboard/Makefile.am @@ -19,7 +19,7 @@ xwinclip_SOURCES = xwinclip.c debug.c xwinclip_CFLAGS = $(XWINMODULES_CFLAGS) -xwinclip_LDADD = libXWinclipboard.la $(XWINMODULES_LIBS) -lgdi32 +xwinclip_LDADD = libXWinclipboard.la $(XWINMODULES_LIBS) -lgdi32 -lpthread include $(top_srcdir)/manpages.am appman_PRE = xwinclip.man |