mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:awakecoding/FreeRDP

Browse Source
This commit is contained in:
Marc-André Moreau 2013-05-25 15:50:00 -04:00
commit c2e7b51b01
6 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/X11/xf_interface.c
View File

@ -92,6 +92,7 @@ static const size_t password_size = 512;
void xf_draw_screen_scaled(xfInfo* xfi)
{
#ifdef WITH_XRENDER
XTransform transform;
Picture windowPicture;
Picture primaryPicture;
@ -117,6 +118,7 @@ void xf_draw_screen_scaled(xfInfo* xfi)
XRenderSetPictureTransform(xfi->display, primaryPicture, &transform);
XRenderComposite(xfi->display, PictOpSrc, primaryPicture, 0, windowPicture, 0, 0, 0, 0, 0, 0, xfi->currentWidth, xfi->currentHeight);
#endif
}
void xf_context_new(freerdp* instance, rdpContext* context)

6
cmake/FindXrender.cmake
View File

@ -36,9 +36,9 @@ include(FindPackageHandleStandardArgs)
FIND_PACKAGE_HANDLE_STANDARD_ARGS(Xrender DEFAULT_MSG Xrender_LIBRARY Xrender_INCLUDE_DIR)
if(Xrender_FOUND)
set(XRENDER_LIBRARIES ${Xrender_LIBRARY})
set(XRENDER_INCLUDE_DIRS ${Xrender_INCLUDE_DIR})
set(XRENDER_LIBRARIES ${Xrender_LIBRARY})
set(XRENDER_INCLUDE_DIRS ${Xrender_INCLUDE_DIR})
endif()
mark_as_advanced(Xrender_INCLUDE_DIR Xrender_LIBRARY)
mark_as_advanced(XRENDER_INCLUDE_DIRS XRENDER_LIBRARIES)

2
libfreerdp/CMakeLists.txt
View File

@ -52,7 +52,7 @@ if(MONOLITHIC_BUILD)
set(${MODULE_PREFIX}_OBJECTS ${${MODULE_PREFIX}_OBJECTS} "$<TARGET_OBJECTS:${MODULE_NAME}-${${MODULE_PREFIX}_SUBMODULE}>")
endforeach()
add_library(${MODULE_NAME} ${${MODULE_PREFIX}_OBJECTS})
add_library(${MODULE_NAME} dummy.c ${${MODULE_PREFIX}_OBJECTS})
set_target_properties(${MODULE_NAME} PROPERTIES LINKER_LANGUAGE C)
set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${FREERDP_VERSION} SOVERSION ${FREERDP_API_VERSION} PREFIX "lib")

5
libfreerdp/dummy.c Normal file
View File

@ -0,0 +1,5 @@
int dummy()
{
return 0;
}

2
winpr/libwinpr/CMakeLists.txt
View File

@ -48,7 +48,7 @@ if(MONOLITHIC_BUILD)
set(${MODULE_PREFIX}_OBJECTS ${${MODULE_PREFIX}_OBJECTS} "$<TARGET_OBJECTS:${MODULE_NAME}-${${MODULE_PREFIX}_SUBMODULE}>")
endforeach()
add_library(${MODULE_NAME} ${${MODULE_PREFIX}_OBJECTS})
add_library(${MODULE_NAME} dummy.c ${${MODULE_PREFIX}_OBJECTS})
set_target_properties(${MODULE_NAME} PROPERTIES LINKER_LANGUAGE C)
set_target_properties(${MODULE_NAME} PROPERTIES VERSION ${WINPR_VERSION_FULL} SOVERSION ${WINPR_VERSION} PREFIX "lib")

5
winpr/libwinpr/dummy.c Normal file
View File

@ -0,0 +1,5 @@
int dummy()
{
return 0;
}