diff options
| author | Pierre Ossman <ossman@cendio.se> | 2009-12-23 09:51:37 +0000 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2009-12-23 09:51:37 +0000 |
| commit | f2180b2b6083d80919f33b58dc95cea6777795f7 (patch) | |
| tree | 90976b862a2d7d36dd9f45402c41c77b5913447e /win/rfb_win32 | |
| parent | 52a3a4f9ee69939c6c1218ff82a040764cfe66e8 (diff) | |
| download | tigervnc-f2180b2b6083d80919f33b58dc95cea6777795f7.tar.gz tigervnc-f2180b2b6083d80919f33b58dc95cea6777795f7.zip | |
Make it possible to compile things with current upstream mingw. You'll lose
WinVNC but it is now possible to compile vncviewer at least.
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3934 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'win/rfb_win32')
| -rw-r--r-- | win/rfb_win32/Makefile.am | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/win/rfb_win32/Makefile.am b/win/rfb_win32/Makefile.am index 3d8545a9..74f74e8e 100644 --- a/win/rfb_win32/Makefile.am +++ b/win/rfb_win32/Makefile.am @@ -4,7 +4,6 @@ HDRS = \ AboutDialog.h \ BitmapInfo.h \ CKeyboard.h \ - CleanDesktop.h \ Clipboard.h \ CompatibleBitmap.h \ ComputerName.h \ @@ -58,7 +57,6 @@ HDRS = \ librfb_win32_la_SOURCES = $(HDRS) \ AboutDialog.cxx \ CKeyboard.cxx \ - CleanDesktop.cxx \ Clipboard.cxx \ CPointer.cxx \ CurrentUser.cxx \ @@ -97,5 +95,12 @@ librfb_win32_la_SOURCES = $(HDRS) \ WMShatter.cxx \ WMWindowCopyRect.cxx +# These files rely on features not yet in upstream mingw +if BUILD_WINVNC +librfb_win32_la_SOURCES += \ + CleanDesktop.h \ + CleanDesktop.cxx +endif + librfb_win32_la_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/win librfb_win32_la_LIBADD = |