diff options
Diffstat (limited to 'win/winvnc')
| -rw-r--r-- | win/winvnc/CMakeLists.txt | 33 | ||||
| -rw-r--r-- | win/winvnc/Makefile.am | 2 | ||||
| -rw-r--r-- | win/winvnc/winvnc.rc | 22 | ||||
| -rw-r--r-- | win/winvnc/winvnc4.exe.manifest64 | 22 |
4 files changed, 72 insertions, 7 deletions
diff --git a/win/winvnc/CMakeLists.txt b/win/winvnc/CMakeLists.txt new file mode 100644 index 00000000..811492c2 --- /dev/null +++ b/win/winvnc/CMakeLists.txt @@ -0,0 +1,33 @@ +include_directories(${CMAKE_BINARY_DIR}/win) + +# Disable auto-generated manifests, since we have our own +if(MSVC) + set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO") +endif() + +add_library(wm_hooks SHARED + ../wm_hooks/wm_hooks.cxx + ../wm_hooks/wm_hooks.def + ../wm_hooks/wm_hooks.rc) + +add_executable(winvnc4 WIN32 + buildTime.cxx + ControlPanel.cxx + JavaViewer.cxx + ManagedListener.cxx + QueryConnectDialog.cxx + STrayIcon.cxx + VNCServerService.cxx + VNCServerWin32.cxx + winvnc.cxx + winvnc.rc) + +target_link_libraries(winvnc4 rfb rfb_win32 Xregion network rdr ws2_32.lib) + +install(TARGETS winvnc4 + RUNTIME DESTINATION . +) + +install(TARGETS wm_hooks + RUNTIME DESTINATION . +) diff --git a/win/winvnc/Makefile.am b/win/winvnc/Makefile.am index 19f3ada2..0ede9218 100644 --- a/win/winvnc/Makefile.am +++ b/win/winvnc/Makefile.am @@ -20,7 +20,7 @@ winvnc4_LDADD = $(top_builddir)/common/rfb/librfb.la \ winvnc4_LDFLAGS = -mwindows
EXTRA_DIST = winvnc.rc winvnc.ico connected.ico icon_dis.ico connecte.ico \
- winvnc4.exe.manifest winvnc.bmp
+ winvnc4.exe.manifest winvnc.bmp CMakeLists.txt
resources.o: winvnc.rc
$(WINDRES) $^ -o $@
diff --git a/win/winvnc/winvnc.rc b/win/winvnc/winvnc.rc index 3cbc0a45..d514c4a5 100644 --- a/win/winvnc/winvnc.rc +++ b/win/winvnc/winvnc.rc @@ -1,6 +1,7 @@ //Microsoft Developer Studio generated resource script. // #include "resource.h" +#include "resdefs.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -58,8 +59,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,90,0 - PRODUCTVERSION 1,0,90,0 + FILEVERSION __RCVERSION + PRODUCTVERSION __RCVERSION FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -76,15 +77,20 @@ BEGIN BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "TigerVNC Project\0" + #ifdef WIN64 + VALUE "FileDescription", "TigerVNC Server for Win64\0" + VALUE "ProductName", "TigerVNC Server for Win64\0" + #else VALUE "FileDescription", "TigerVNC Server for Win32\0" - VALUE "FileVersion", "1.0.90\0" + VALUE "ProductName" "TigerVNC Server for Win32\0" + #endif + VALUE "FileVersion", __RCVERSIONSTR VALUE "InternalName", "winvnc\0" - VALUE "LegalCopyright", "Copyright (C) 1998-2009 [many holders]\0" + VALUE "LegalCopyright", "Copyright (C) 1998-2010 [many holders]\0" VALUE "LegalTrademarks", "TigerVNC\0" VALUE "OriginalFilename", "winvnc4.exe\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "TigerVNC Server\0" - VALUE "ProductVersion", "1.0.90\0" + VALUE "ProductVersion", __VERSIONSTR VALUE "SpecialBuild", "\0" END END @@ -222,7 +228,11 @@ END // 24 // +#ifdef WIN64 +IDR_MANIFEST 24 DISCARDABLE "winvnc4.exe.manifest64" +#else IDR_MANIFEST 24 DISCARDABLE "winvnc4.exe.manifest" +#endif ///////////////////////////////////////////////////////////////////////////// // diff --git a/win/winvnc/winvnc4.exe.manifest64 b/win/winvnc/winvnc4.exe.manifest64 new file mode 100644 index 00000000..be022436 --- /dev/null +++ b/win/winvnc/winvnc4.exe.manifest64 @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> +<assemblyIdentity + version="4.0.0.26" + processorArchitecture="AMD64" + name="TigerVNC.winvnc4.exe" + type="win32" +/> +<description>.NET control deployment tool</description> +<dependency> + <dependentAssembly> + <assemblyIdentity + type="win32" + name="Microsoft.Windows.Common-Controls" + version="6.0.0.0" + processorArchitecture="AMD64" + publicKeyToken="6595b64144ccf1df" + language="*" + /> + </dependentAssembly> +</dependency> +</assembly> |