diff options
Diffstat (limited to 'win')
| -rw-r--r-- | win/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | win/Makefile.am | 11 | ||||
| -rw-r--r-- | win/resdefs.h.cmake.in | 4 | ||||
| -rw-r--r-- | win/resdefs.h.in | 1 | ||||
| -rw-r--r-- | win/rfb_win32/Makefile.am | 111 | ||||
| -rw-r--r-- | win/vncconfig/Makefile.am | 21 | ||||
| -rw-r--r-- | win/vncviewer/Makefile.am | 49 | ||||
| -rw-r--r-- | win/winvnc/Makefile.am | 27 |
8 files changed, 2 insertions, 224 deletions
diff --git a/win/CMakeLists.txt b/win/CMakeLists.txt index 61afe4d7..f8b5d5d6 100644 --- a/win/CMakeLists.txt +++ b/win/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories(${CMAKE_SOURCE_DIR}/common ${CMAKE_SOURCE_DIR}/win) -configure_file(resdefs.h.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/resdefs.h) +configure_file(resdefs.h.in ${CMAKE_CURRENT_BINARY_DIR}/resdefs.h) add_subdirectory(rfb_win32) diff --git a/win/Makefile.am b/win/Makefile.am deleted file mode 100644 index 1958be94..00000000 --- a/win/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -SUBDIRS = rfb_win32 vncviewer - -if BUILD_WINVNC -SUBDIRS += vncconfig winvnc -endif - -EXTRA_DIST = logmessages LICENCE.TXT README.txt README_BINARY.txt \ - resdefs.h.in tigervnc.iss.in wm_hooks CMakeLists.txt resdefs.h.cmake.in - -dist-hook: - rm -rf `find $(distdir) -name .svn` diff --git a/win/resdefs.h.cmake.in b/win/resdefs.h.cmake.in deleted file mode 100644 index b61db53e..00000000 --- a/win/resdefs.h.cmake.in +++ /dev/null @@ -1,4 +0,0 @@ -#define __VERSIONSTR "@VERSION@\0" -#define __RCVERSION @RCVERSION@ -#define __RCVERSIONSTR "@RCVERSION@\0" -#cmakedefine WIN64 diff --git a/win/resdefs.h.in b/win/resdefs.h.in index e86a92d3..b61db53e 100644 --- a/win/resdefs.h.in +++ b/win/resdefs.h.in @@ -1,3 +1,4 @@ #define __VERSIONSTR "@VERSION@\0" #define __RCVERSION @RCVERSION@ #define __RCVERSIONSTR "@RCVERSION@\0" +#cmakedefine WIN64 diff --git a/win/rfb_win32/Makefile.am b/win/rfb_win32/Makefile.am deleted file mode 100644 index c6ae74e4..00000000 --- a/win/rfb_win32/Makefile.am +++ /dev/null @@ -1,111 +0,0 @@ -noinst_LTLIBRARIES = librfb_win32.la - -HDRS = \ - AboutDialog.h \ - BitmapInfo.h \ - CKeyboard.h \ - Clipboard.h \ - CompatibleBitmap.h \ - ComputerName.h \ - CPointer.h \ - CurrentUser.h \ - DeviceContext.h \ - DeviceFrameBuffer.h \ - Dialog.h \ - DIBSectionBuffer.h \ - DynamicFn.h \ - EventManager.h \ - Handle.h \ - IconInfo.h \ - IntervalTimer.h \ - keymap.h \ - LaunchProcess.h \ - ListViewControl.h \ - LocalMem.h \ - LogicalPalette.h \ - LowLevelKeyEvents.h \ - ModuleFileName.h \ - MonitorInfo.h \ - MsgBox.h \ - MsgWindow.h \ - OSVersion.h \ - ProgressControl.h \ - RegConfig.h \ - Registry.h \ - resource.h \ - ScaledDIBSectionBuffer.h \ - SecurityPage.h \ - SDisplayCoreDriver.h \ - SDisplayCorePolling.h \ - SDisplayCoreWMHooks.h \ - SDisplay.h \ - Security.h \ - Service.h \ - SInput.h \ - SocketManager.h \ - TCharArray.h \ - Threading.h \ - ToolBar.h \ - TrayIcon.h \ - TsSessions.h \ - Win32Util.h \ - WMCursor.h \ - WMHooks.h \ - WMNotifier.h \ - WMPoller.h \ - WMShatter.h \ - WMWindowCopyRect.h - -librfb_win32_la_SOURCES = $(HDRS) \ - AboutDialog.cxx \ - CKeyboard.cxx \ - Clipboard.cxx \ - CPointer.cxx \ - CurrentUser.cxx \ - DeviceContext.cxx \ - DeviceFrameBuffer.cxx \ - Dialog.cxx \ - DIBSectionBuffer.cxx \ - DynamicFn.cxx \ - EventManager.cxx \ - LaunchProcess.cxx \ - ListViewControl.cxx \ - LowLevelKeyEvents.cxx \ - MonitorInfo.cxx \ - MsgWindow.cxx \ - OSVersion.cxx \ - ProgressControl.cxx \ - RegConfig.cxx \ - Registry.cxx \ - ScaledDIBSectionBuffer.cxx \ - SecurityPage.cxx \ - SDisplayCorePolling.cxx \ - SDisplayCoreWMHooks.cxx \ - SDisplay.cxx \ - Security.cxx \ - Service.cxx \ - SInput.cxx \ - SocketManager.cxx \ - TCharArray.cxx \ - Threading.cxx \ - ToolBar.cxx \ - TsSessions.cxx \ - Win32Util.cxx \ - WMCursor.cxx \ - WMHooks.cxx \ - WMNotifier.cxx \ - WMPoller.cxx \ - 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 = - -EXTRA_DIST = CMakeLists.txt diff --git a/win/vncconfig/Makefile.am b/win/vncconfig/Makefile.am deleted file mode 100644 index 5665ac44..00000000 --- a/win/vncconfig/Makefile.am +++ /dev/null @@ -1,21 +0,0 @@ -bin_PROGRAMS = vncconfig - -HDRS = Authentication.h Connections.h Desktop.h Hooking.h Inputs.h Legacy.h \ - PasswordDialog.h resource.h Sharing.h - -vncconfig_SOURCES = $(HDRS) Legacy.cxx PasswordDialog.cxx vncconfig.cxx - -vncconfig_CPPFLAGS = -I$(top_srcdir)/win -I$(top_srcdir)/common - -vncconfig_LDADD = $(top_builddir)/win/rfb_win32/librfb_win32.la \ - $(top_builddir)/common/rfb/librfb.la \ - $(top_builddir)/common/Xregion/libXregion.la \ - $(top_builddir)/common/network/libnetwork.la \ - $(top_builddir)/common/rdr/librdr.la -lws2_32 -lgdi32 -lversion -lole32 \ - -lcomctl32 resources.o - -EXTRA_DIST = vncconfig.ico vncconfig.rc vncconfig.exe.manifest \ - vncconfig.exe.manifest64 CMakeLists.txt - -resources.o: vncconfig.rc - $(WINDRES) -I$(top_builddir)/win $^ -o $@ diff --git a/win/vncviewer/Makefile.am b/win/vncviewer/Makefile.am deleted file mode 100644 index b11dfa1c..00000000 --- a/win/vncviewer/Makefile.am +++ /dev/null @@ -1,49 +0,0 @@ -bin_PROGRAMS = vncviewer - -HDRS = \ - CConn.h \ - CConnOptions.h \ - CConnThread.h \ - ConnectingDialog.h \ - ConnectionDialog.h \ - DesktopWindow.h \ - InfoDialog.h \ - ListenServer.h \ - ListenTrayIcon.h \ - MRU.h \ - OptionsDialog.h \ - resource.h \ - UserPasswdDialog.h \ - ViewerToolBar.h - -vncviewer_SOURCES = $(HDRS) \ - buildTime.cxx \ - CConn.cxx \ - CConnOptions.cxx \ - CConnThread.cxx \ - ConnectingDialog.cxx \ - ConnectionDialog.cxx \ - DesktopWindow.cxx \ - InfoDialog.cxx \ - OptionsDialog.cxx \ - UserPasswdDialog.cxx \ - ViewerToolBar.cxx \ - vncviewer.cxx - -vncviewer_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/win - -vncviewer_LDADD = $(top_builddir)/common/rfb/librfb.la \ - $(top_builddir)/win/rfb_win32/librfb_win32.la \ - $(top_builddir)/common/Xregion/libXregion.la \ - $(top_builddir)/common/network/libnetwork.la \ - $(top_builddir)/common/rdr/librdr.la \ - $(top_builddir)/common/os/libos.la \ - resources.o -lws2_32 -lgdi32 -luser32 -lcomctl32 -lversion -lcomdlg32 - -vncviewer_LDFLAGS = -I$(top_srcdir)/win -mwindows - -EXTRA_DIST = vncviewer.rc vncviewer.ico cursor1.cur vncviewer.exe.manifest \ - vncviewer.exe.manifest64 vncviewer.bmp toolbar.bmp CMakeLists.txt - -resources.o: vncviewer.rc - $(WINDRES) -I$(top_builddir)/win $^ -o $@ diff --git a/win/winvnc/Makefile.am b/win/winvnc/Makefile.am deleted file mode 100644 index 736a7a99..00000000 --- a/win/winvnc/Makefile.am +++ /dev/null @@ -1,27 +0,0 @@ -bin_PROGRAMS = winvnc4 - -HDRS = AddNewClientDialog.h ControlPanel.h JavaViewer.h ManagedListener.h \ - QueryConnectDialog.h STrayIcon.h VNCServerService.h VNCServerWin32.h \ - resource.h - -winvnc4_SOURCES = $(HDRS) buildTime.cxx ControlPanel.cxx JavaViewer.cxx \ - ManagedListener.cxx QueryConnectDialog.cxx STrayIcon.cxx \ - VNCServerService.cxx VNCServerWin32.cxx winvnc.cxx - -winvnc4_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/win - -winvnc4_LDADD = $(top_builddir)/common/rfb/librfb.la \ - $(top_builddir)/win/rfb_win32/librfb_win32.la \ - $(top_builddir)/common/Xregion/libXregion.la \ - $(top_builddir)/common/network/libnetwork.la \ - $(top_builddir)/common/rdr/librdr.la resources.o -lws2_32 -lgdi32 \ - -lole32 -lcomctl32 -lversion - -winvnc4_LDFLAGS = -mwindows - -EXTRA_DIST = winvnc.rc winvnc.ico connected.ico icon_dis.ico connecte.ico \ - winvnc4.exe.manifest winvnc4.exe.manifest64 winvnc.bmp index.vnc \ - CMakeLists.txt - -resources.o: winvnc.rc - $(WINDRES) -I$(top_builddir)/win $^ -o $@ |