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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Corey C 2012-10-04 16:51:57 -04:00
commit 4bab10ea2f
3 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/X11/CMakeLists.txt
View File

@ -66,7 +66,7 @@ endif(WITH_MANPAGES)
find_suggested_package(Xinerama)
if(WITH_XINERAMA)
add_definitions(-DWITH_XINERAMA -DWITH_XEXT)
add_definitions(-DWITH_XINERAMA)
include_directories(${XINERAMA_INCLUDE_DIRS})
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${XINERAMA_LIBRARIES})
endif()
@ -75,7 +75,7 @@ find_suggested_package(Xext)
if(WITH_XEXT)
add_definitions(-DWITH_XEXT)
include_directories(${XEXT_INCLUDE_DIRS})
set(FREERDP_CLIENT_X11_LIBS ${FREERDP_CLIENT_X11_LIBS} ${XEXT_LIBRARIES})
set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} ${XEXT_LIBRARIES})
endif()
find_suggested_package(Xcursor)

11
cmake/FindFFmpeg.cmake
View File

@ -5,9 +5,6 @@
# FFMPEG_INCLUDE_DIRS - combined include directories
# FFMPEG_LIBRARIES - combined libraries to link
set(REQUIRED_AVCODEC_VERSION 0.8)
set(REQUIRED_AVCODEC_API_VERSION 53.25.0)
include(FindPkgConfig)
if (PKG_CONFIG_FOUND)
@ -34,14 +31,6 @@ endif()
FIND_PACKAGE_HANDLE_STANDARD_ARGS(FFmpeg DEFAULT_MSG AVUTIL_FOUND AVCODEC_FOUND)
if (AVCODEC_VERSION)
if (${AVCODEC_VERSION} VERSION_LESS ${REQUIRED_AVCODEC_API_VERSION})
message(FATAL_ERROR "libavcodec version >= ${REQUIRED_AVCODEC_VERSION} (API >= ${REQUIRED_AVCODEC_API_VERSION}) is required")
endif()
else()
message("Note: To build libavcodec version >= ${REQUIRED_AVCODEC_VERSION} (API >= ${REQUIRED_AVCODEC_API_VERSION}) is required")
endif()
if(FFMPEG_FOUND)
set(FFMPEG_INCLUDE_DIRS ${AVCODEC_INCLUDE_DIR} ${AVUTIL_INCLUDE_DIR})
set(FFMPEG_LIBRARIES ${AVCODEC_LIBRARY} ${AVUTIL_LIBRARY})

7
winpr/include/winpr/wtypes.h
View File

@ -89,15 +89,12 @@ typedef unsigned __int3264 ULONG_PTR, *PULONG_PTR;
typedef signed int LONG32;
typedef signed __int64 LONG64;
typedef CHAR* PSTR, *LPSTR;
typedef CHAR* PSTR, *LPSTR, *LPCH;
typedef const CHAR *LPCSTR,*PCSTR;
typedef WCHAR* LPWSTR, *PWSTR;
typedef WCHAR* LPWSTR, *PWSTR, *LPWCH;
typedef const WCHAR *LPCWSTR,*PCWSTR;
typedef CHAR *LPSTR, *LPCH;
typedef WCHAR *LPWSTR, *LPWCH;
typedef unsigned __int64 QWORD;
typedef UCHAR* STRING;