diff options
Diffstat (limited to 'win/vncviewer')
| -rw-r--r-- | win/vncviewer/CMakeLists.txt | 28 | ||||
| -rw-r--r-- | win/vncviewer/Makefile.am | 2 | ||||
| -rw-r--r-- | win/vncviewer/vncviewer.rc | 20 |
3 files changed, 42 insertions, 8 deletions
diff --git a/win/vncviewer/CMakeLists.txt b/win/vncviewer/CMakeLists.txt new file mode 100644 index 00000000..863e2d07 --- /dev/null +++ b/win/vncviewer/CMakeLists.txt @@ -0,0 +1,28 @@ +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(vncviewer WIN32 + 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.rc) + +target_link_libraries(vncviewer rfb rfb_win32 Xregion network rdr + ws2_32.lib) + +install(TARGETS vncviewer + RUNTIME DESTINATION . +) diff --git a/win/vncviewer/Makefile.am b/win/vncviewer/Makefile.am index db398aef..1a486254 100644 --- a/win/vncviewer/Makefile.am +++ b/win/vncviewer/Makefile.am @@ -42,7 +42,7 @@ vncviewer_LDADD = $(top_builddir)/common/rfb/librfb.la \ vncviewer_LDFLAGS = -I$(top_srcdir)/win -mwindows EXTRA_DIST = vncviewer.rc vncviewer.ico cursor1.cur vncviewer.exe.manifest \ - vncviewer.bmp toolbar.bmp + vncviewer.bmp toolbar.bmp CMakeLists.txt resources.o: vncviewer.rc $(WINDRES) $^ -o $@ diff --git a/win/vncviewer/vncviewer.rc b/win/vncviewer/vncviewer.rc index 076d5b8b..60aa6363 100644 --- a/win/vncviewer/vncviewer.rc +++ b/win/vncviewer/vncviewer.rc @@ -1,6 +1,7 @@ //Microsoft Developer Studio generated resource script. // #include "resource.h" +#include "resdefs.h" #define APSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// @@ -67,8 +68,8 @@ IDI_ICON ICON DISCARDABLE "vncviewer.ico" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,90,0 - PRODUCTVERSION 1,0,90,0 + FILEVERSION __RCVERSION + PRODUCTVERSION __RCVERSION FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -85,15 +86,20 @@ BEGIN BEGIN VALUE "Comments", "\0" VALUE "CompanyName", "TigerVNC Project\0" + #ifdef WIN64 + VALUE "FileDescription", "TigerVNC Viewer for Win64\0" + VALUE "ProductName", "TigerVNC Viewer for Win64\0" + #else VALUE "FileDescription", "TigerVNC Viewer for Win32\0" - VALUE "FileVersion", "1.0.90\0" + VALUE "ProductName", "TigerVNC Viewer for Win32\0" + #endif + VALUE "FileVersion", __RCVERSIONSTR VALUE "InternalName", "free4/vncviewer/win\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", "vncviewer.exe\0" VALUE "PrivateBuild", "\0" - VALUE "ProductName", "TigerVNC Viewer\0" - VALUE "ProductVersion", "1.0.90\0" + VALUE "ProductVersion", __VERSIONSTR VALUE "SpecialBuild", "\0" END END @@ -534,7 +540,7 @@ END // 24 // -#ifdef _WIN64 +#ifdef WIN64 IDR_MANIFEST 24 DISCARDABLE "vncviewer.exe.manifest64" #else IDR_MANIFEST 24 DISCARDABLE "vncviewer.exe.manifest" |