diff options
| author | marha <marha@users.sourceforge.net> | 2014-10-01 23:12:13 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-10-01 23:12:13 +0200 |
| commit | 88236adfe3eb41b8368b4c9ecf3e09a7199dc474 (patch) | |
| tree | 6acb3f7ad3c60c4605551245df9c321b5fb22c3b /xorg-server/hw/xwin/makefile | |
| parent | e4086b3defb6186a2fb8a5845968c97e613fb493 (diff) | |
| parent | 30eb28e89e513ba7c04e8424be0cba326a01882b (diff) | |
| download | vcxsrv-88236adfe3eb41b8368b4c9ecf3e09a7199dc474.tar.gz vcxsrv-88236adfe3eb41b8368b4c9ecf3e09a7199dc474.tar.bz2 vcxsrv-88236adfe3eb41b8368b4c9ecf3e09a7199dc474.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/hw/xwin/InitOutput.c
xorg-server/hw/xwin/win.h
xorg-server/hw/xwin/winclipboard/internal.h
xorg-server/hw/xwin/winclipboard/thread.c
xorg-server/hw/xwin/winclipboard/wndproc.c
xorg-server/hw/xwin/winclipboard/xevents.c
xorg-server/hw/xwin/winclipboardinit.c
xorg-server/hw/xwin/winclipboardwrappers.c
xorg-server/hw/xwin/winglobals.c
Diffstat (limited to 'xorg-server/hw/xwin/makefile')
| -rw-r--r-- | xorg-server/hw/xwin/makefile | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/xorg-server/hw/xwin/makefile b/xorg-server/hw/xwin/makefile index 46bcc1e05..cc8aeb544 100644 --- a/xorg-server/hw/xwin/makefile +++ b/xorg-server/hw/xwin/makefile @@ -12,12 +12,9 @@ XWIN_GLX_WINDOWS=1 # everything is in the glx makefile if XWIN_CLIPBOARD SRCS_CLIPBOARD = \ winclipboardinit.c \ - winclipboardtextconv.c \ - winclipboardthread.c \ - winclipboardwndproc.c \ - winclipboardwrappers.c \ - winclipboardxevents.c + winclipboardwrappers.c DEFS_CLIPBOARD = -DXWIN_CLIPBOARD +INCLUDES_CLIPBOARD = winclipboard endif if XWIN_GLX_WINDOWS @@ -156,7 +153,7 @@ CSRCS := $(CSRCS:%.l=%.c) DEFINES += $(DEFS:-D%=%) HAVE_XWIN_CONFIG_H PTW32_STATIC_LIB RELOCATE_PROJECTROOT -INCLUDES += ..\.. ..\..\miext\rootless +INCLUDES += $(INCLUDES_CLIPBOARD) ..\.. ..\..\miext\rootless INCLUDES += $(OBJDIR) |