diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2015-01-10 20:42:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2015-01-10 20:42:02 -0600 |
| commit | 710a9c7c320fab11ac523662b93140c14e8163a4 (patch) | |
| tree | 88fc9aeabaf5372bfe6ece2b30ff0538d36f7bb9 /krfb | |
| parent | f6187cc4eb8a8726f5b64f0c640ac8d2355b85eb (diff) | |
| download | tdenetwork-710a9c7c320fab11ac523662b93140c14e8163a4.tar.gz tdenetwork-710a9c7c320fab11ac523662b93140c14e8163a4.zip | |
Use latest libvncserver module for krfb
This relates to Bug 1582 among others
Diffstat (limited to 'krfb')
| -rw-r--r-- | krfb/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | krfb/krfb/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | krfb/krfb/rfbcontroller.h | 4 |
3 files changed, 9 insertions, 4 deletions
diff --git a/krfb/CMakeLists.txt b/krfb/CMakeLists.txt index 9be3dcc1..0b9d875b 100644 --- a/krfb/CMakeLists.txt +++ b/krfb/CMakeLists.txt @@ -1,5 +1,8 @@ ################################################# # +# (C) 2015 Timothy Pearson +# kb9vqf (AT) pearsoncomputing (DOT) net +# # (C) 2010-2011 Serghei Amelian # serghei (DOT) amelian (AT) gmail.com # @@ -16,3 +19,4 @@ add_subdirectory( kinetd ) add_subdirectory( krfb ) add_subdirectory( kcm_krfb ) add_subdirectory( krfb_httpd ) + diff --git a/krfb/krfb/CMakeLists.txt b/krfb/krfb/CMakeLists.txt index 4251ebdc..ff9ae20a 100644 --- a/krfb/krfb/CMakeLists.txt +++ b/krfb/krfb/CMakeLists.txt @@ -12,7 +12,8 @@ include_directories( ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../srvloc - ${CMAKE_CURRENT_SOURCE_DIR}/../libvncserver + ${CMAKE_CURRENT_SOURCE_DIR}/../../libtdevnc + ${CMAKE_CURRENT_BINARY_DIR}/../../libtdevnc ${CMAKE_BINARY_DIR} ${TDE_INCLUDE_DIR} ${TQT_INCLUDE_DIRS} @@ -39,7 +40,7 @@ tde_add_executable( krfb AUTOMOC rfbcontroller.cc xupdatescanner.cc main.cpp connectionwidget.ui krfbifaceimpl.cc krfbiface.skel trayicon.cpp connectiondialog.cc LINK - krfbconfig-static srvloc-static tdeui-shared tdeio-shared jpeg Xext pthread ${XTST_LIBRARIES} ${LIBVNCSERVER_LIBRARIES} + krfbconfig-static tdevncserver-static srvloc-static tdeui-shared tdeio-shared jpeg Xext pthread ${XTST_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/krfb/krfb/rfbcontroller.h b/krfb/krfb/rfbcontroller.h index be1870ae..e5595311 100644 --- a/krfb/krfb/rfbcontroller.h +++ b/krfb/krfb/rfbcontroller.h @@ -32,11 +32,11 @@ #include <tqmutex.h> #define HAVE_PTHREADS -#include <rfb/rfb.h> +#include "rfb/rfb.h" #include <X11/Xlib.h> -// #define USE_MODIFIED_BUILTIN_LIBVNCSERVER +#define USE_MODIFIED_BUILTIN_LIBVNCSERVER class TQCloseEvent; |