diff options
| author | DRC <dcommander@users.sourceforge.net> | 2010-10-27 07:20:27 +0000 |
|---|---|---|
| committer | DRC <dcommander@users.sourceforge.net> | 2010-10-27 07:20:27 +0000 |
| commit | 180c0167b41bfcbfa33cd6a145ee0dc7b62505b2 (patch) | |
| tree | ef4e2b196de5f2d3889a6a2fa98d4968eea9be6e /win/vncconfig | |
| parent | 7d5d536b73fb70a91a9e88a9bbcb75660caa695c (diff) | |
| download | tigervnc-180c0167b41bfcbfa33cd6a145ee0dc7b62505b2.tar.gz tigervnc-180c0167b41bfcbfa33cd6a145ee0dc7b62505b2.zip | |
CMake build system for Windows
git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@4171 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'win/vncconfig')
| -rw-r--r-- | win/vncconfig/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | win/vncconfig/Makefile.am | 2 | ||||
| -rw-r--r-- | win/vncconfig/vncconfig.exe.manifest64 | 22 | ||||
| -rw-r--r-- | win/vncconfig/vncconfig.rc | 22 |
4 files changed, 57 insertions, 7 deletions
diff --git a/win/vncconfig/CMakeLists.txt b/win/vncconfig/CMakeLists.txt new file mode 100644 index 00000000..9883dbd8 --- /dev/null +++ b/win/vncconfig/CMakeLists.txt @@ -0,0 +1,18 @@ +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_executable(vncconfig WIN32 + Legacy.cxx + PasswordDialog.cxx + vncconfig.cxx + vncconfig.rc) + +target_link_libraries(vncconfig rfb_win32 rfb Xregion network rdr ws2_32.lib) + +install(TARGETS vncconfig + RUNTIME DESTINATION . +) diff --git a/win/vncconfig/Makefile.am b/win/vncconfig/Makefile.am index 84d1b0ff..b22b28c1 100644 --- a/win/vncconfig/Makefile.am +++ b/win/vncconfig/Makefile.am @@ -14,7 +14,7 @@ vncconfig_LDADD = $(top_builddir)/win/rfb_win32/librfb_win32.la \ $(top_builddir)/common/rdr/librdr.la -lws2_32 -lgdi32 -lversion -lole32 \
-lcomctl32 resources.o
-EXTRA_DIST = vncconfig.ico vncconfig.rc vncconfig.exe.manifest
+EXTRA_DIST = vncconfig.ico vncconfig.rc vncconfig.exe.manifest CMakeLists.txt
resources.o: vncconfig.rc
$(WINDRES) $^ -o $@
diff --git a/win/vncconfig/vncconfig.exe.manifest64 b/win/vncconfig/vncconfig.exe.manifest64 new file mode 100644 index 00000000..10eefa30 --- /dev/null +++ b/win/vncconfig/vncconfig.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.vncconfig.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> diff --git a/win/vncconfig/vncconfig.rc b/win/vncconfig/vncconfig.rc index 7292f1a5..df6cfdde 100644 --- a/win/vncconfig/vncconfig.rc +++ b/win/vncconfig/vncconfig.rc @@ -1,6 +1,7 @@ //Microsoft Developer Studio generated resource script. // #include "resource.h" +#include "resdefs.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -438,8 +439,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 @@ -456,15 +457,20 @@ BEGIN BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "TigerVNC Project\0" + #ifdef WIN64 + VALUE "FileDescription", "TigerVNC Server Configuration Applet for Win64\0" + VALUE "ProductName", "TigerVNC Server Configuration Applet for Win64\0" + #else VALUE "FileDescription", "TigerVNC Server Configuration Applet for Win32\0" - VALUE "FileVersion", "1.0.90\0" + VALUE "ProductName", "TigerVNC Server Configuration Applet for Win32\0" + #endif + VALUE "FileVersion", __RCVERSIONSTR VALUE "InternalName", "vncconfig\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", "vncconfig.exe\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "TigerVNC Configurator\0" - VALUE "ProductVersion", "1.0.90\0" + VALUE "ProductVersion", __VERSIONSTR VALUE "SpecialBuild", "\0" END END @@ -482,7 +488,11 @@ END // 24 // +#ifdef WIN64 +IDR_MANIFEST 24 DISCARDABLE "vncconfig.exe.manifest64" +#else IDR_MANIFEST 24 DISCARDABLE "vncconfig.exe.manifest" +#endif #endif // English (U.K.) resources ///////////////////////////////////////////////////////////////////////////// |