Permalink
Browse files

xfreerdp-server: improved RemoteFX encoding

  • Loading branch information...
1 parent f1c12c4 commit a3459eeb5b4da831dbe30c7f20d4cdfdcf8d1829 @awakecoding awakecoding committed Jan 8, 2012
Showing with 333 additions and 67 deletions.
  1. +7 −8 .gitignore
  2. +49 −0 cmake/FindXTest.cmake
  3. +8 −0 server/X11/CMakeLists.txt
  4. +255 −59 server/X11/xf_peer.c
  5. +10 −0 server/X11/xf_peer.h
  6. +4 −0 server/X11/xfreerdp.h
View
@@ -5,15 +5,10 @@ config.h
install_manifest.txt
CTestTestfile.cmake
freerdp.pc
-
-*.cmake
-/**/*.cmake
-/**/**/*.cmake
-/**/**/**/*.cmake
-/**/**/**/**/*.cmake
-
-# Make
Makefile
+cmake_install.cmake
+CPackConfig.cmake
+CPackSourceConfig.cmake
# Eclipse
*.project
@@ -48,3 +43,7 @@ client/test/freerdp-test
client/DirectFB/dfreerdp
server/test/tfreerdp-server
server/X11/xfreerdp-server
+
+# Other
+*~
+
View
@@ -0,0 +1,49 @@
+# - Find XTEST
+# Find the XTEST libraries
+#
+# This module defines the following variables:
+# XTEST_FOUND - true if XTEST_INCLUDE_DIR & XTEST_LIBRARY are found
+# XTEST_LIBRARIES - Set when XTEST_LIBRARY is found
+# XTEST_INCLUDE_DIRS - Set when XTEST_INCLUDE_DIR is found
+#
+# XTEST_INCLUDE_DIR - where to find XTest.h, etc.
+# XTEST_LIBRARY - the XTEST library
+#
+
+#=============================================================================
+# Copyright 2011 O.S. Systems Software Ltda.
+# Copyright 2011 Otavio Salvador <otavio@ossystems.com.br>
+# Copyright 2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+find_path(XTEST_INCLUDE_DIR NAMES XTest.h
+ PATH_SUFFIXES X11/extensions
+ DOC "The XTest include directory"
+)
+
+find_library(XTEST_LIBRARY NAMES Xtst
+ DOC "The XTest library"
+)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(XTEST DEFAULT_MSG XTEST_LIBRARY XTEST_INCLUDE_DIR)
+
+if(XTEST_FOUND)
+ set( XTEST_LIBRARIES ${XTEST_LIBRARY} )
+ set( XTEST_INCLUDE_DIRS ${XTEST_INCLUDE_DIR} )
+endif()
+
+mark_as_advanced(XTEST_INCLUDE_DIR XTEST_LIBRARY)
+
@@ -45,7 +45,15 @@ if(XFIXES_FOUND)
target_link_libraries(xfreerdp-server ${XFIXES_LIBRARIES})
endif()
+find_suggested_package(XTest)
+if(XTEST_FOUND)
+ add_definitions(-DWITH_XTEST)
+ include_directories(${XTEST_INCLUDE_DIRS})
+ target_link_libraries(xfreerdp-server ${XTEST_LIBRARIES})
+endif()
+
target_link_libraries(xfreerdp-server freerdp-core)
target_link_libraries(xfreerdp-server freerdp-codec)
target_link_libraries(xfreerdp-server freerdp-utils)
+target_link_libraries(xfreerdp-server freerdp-gdi)
target_link_libraries(xfreerdp-server ${X11_LIBRARIES})
Oops, something went wrong.

0 comments on commit a3459ee

Please sign in to comment.