Commit Graph

996 Commits

Author SHA1 Message Date
Marc-André Moreau a2f0e93770 freerdp: fix build warnings 2014-08-18 17:25:48 -04:00
Marc-André Moreau 1a8c763309 Merge branch 'shadow' of github.com:awakecoding/FreeRDP 2014-08-18 17:06:13 -04:00
Marc-André Moreau f30d7cf66a Merge pull request #2024 from repzilon/master
uclibc build fixes and recompressed images
2014-08-18 13:08:52 -04:00
Marc-André Moreau 4148211c6c Merge pull request #2045 from zhangzl2013/fix-cut-fold
drive: fix contents lost when cut-paste a folder.
2014-08-18 13:06:58 -04:00
Zhang Zhaolong 60f283cffb drive: fix contents lost when cut-paste a folder. 2014-08-18 16:00:34 +08:00
Marc-André Moreau 90d202ab87 server: fix build on Windows 2014-08-11 19:31:38 -04:00
Marc-André Moreau e4a4aa4d3a Merge branch 'master' of github.com:awakecoding/FreeRDP into shadow
Conflicts:
	channels/encomsp/client/encomsp_main.c
	libfreerdp/core/tcp.c
	libfreerdp/crypto/certificate.c
	server/Windows/CMakeLists.txt
	server/X11/xf_cursor.c
	server/X11/xf_input.c
	server/X11/xf_interface.c
	server/X11/xf_monitors.c
	server/X11/xf_peer.c
2014-08-11 19:22:33 -04:00
Marc-André Moreau 87fd839a35 libfreerdp-codec: cleanup and fix __lzcnt on Windows 2014-08-11 18:48:42 -04:00
Marc-André Moreau cff9c16c1e Merge branch 'master' of github.com:FreeRDP/FreeRDP
Conflicts:
	channels/disp/client/disp_main.c
2014-08-11 10:36:07 -04:00
Marc-André Moreau 067da290dd Merge pull request #2027 from akallabeth/winpr-log
Replace stdout and logging defines with WLog, add logcat support
2014-08-11 10:38:28 -04:00
Armin Novak 784696c1cd Fixed missing includes and invalid replacement. 2014-08-11 09:38:08 +02:00
Armin Novak 66b8905ac6 Using special log defines for channels now. 2014-08-11 09:12:01 +02:00
Rene Rheaume 4b17230210 Merge remote-tracking branch 'upstream/master' 2014-08-08 20:18:44 -04:00
Ian Whyman 8eb7f69a12 Backwards compat defines 2014-08-08 13:05:06 +01:00
Ian Whyman f73e40d188 CODEC_ID_* -> AV_CODEC_ID_* 2014-08-08 09:05:03 +01:00
Armin Novak b97099e815 Replaced fprintf(stderr with DEBUG_WARN 2014-08-07 22:20:13 +02:00
Armin Novak 158e1323de Fixed compiler warnings. 2014-08-07 19:05:48 +02:00
Armin Novak 219a760bad Fixed logging, now using log functions. 2014-08-07 17:31:42 +02:00
Armin Novak b252009d36 Replaced custom logging mechanism with WLog wrapper. 2014-08-07 16:51:49 +02:00
Rene Rheaume 0d2a3d2e2f Fixed a typo for conditional compilation 2014-08-07 07:11:04 -04:00
Rene Rheaume 223a9f6124 futimens, while being POSIX-compliant, does not exist on Mac OS X. Added futimes back to address this. 2014-08-07 06:47:33 -04:00
Rene Rheaume 5f9c36da5d * Use futimens that is POSIX-compliant and compatible with uclibc instead of futimes.
* Borrowed eventfd_read and eventfd_write from bionic for uclibc compatibility (uclibc headers are broken unfortunately). Bionic and
FreeRDP are both under the Apache 2.0 license.
2014-08-06 22:06:01 -04:00
Marc-André Moreau 3895c930a3 Merge branch 'master' of github.com:awakecoding/FreeRDP into shadow 2014-08-05 09:56:12 -04:00
Marc-André Moreau 85b1d6c167 Merge branch 'master' of github.com:FreeRDP/FreeRDP
Conflicts:
	libfreerdp/codec/h264.c
2014-08-05 09:55:54 -04:00
Bernhard Miklautz a9eed46e38 Fix warnings found in Xcode 2014-07-29 05:22:30 +02:00
Bernhard Miklautz 8c318da7b1 fix compiler warnings 2014-07-29 05:22:29 +02:00
Marc-André Moreau 780079d629 Merge branch 'master' of github.com:awakecoding/FreeRDP into egfx 2014-07-28 16:59:29 -04:00
Marc-André Moreau e303c3bd4c channels: cleanup RDP8 virtual channels 2014-07-28 16:47:42 -04:00
Marc-André Moreau 5d4f28a788 Merge branch 'master' of github.com:awakecoding/FreeRDP into shadow 2014-07-17 17:33:33 -04:00
Marc-André Moreau f6d1d083e9 channels/remdesk: initial dummy server-side remote assistance message parsing 2014-07-15 18:38:32 -04:00
Marc-André Moreau 78520d5141 shadow: add basic server-side encomsp server 2014-07-15 16:34:15 -04:00
Vic Lee 0ba59c842d echo: add server echo channel api. 2014-07-15 11:42:12 +08:00
Marc-André Moreau e7fb6e67f5 shadow: add basic lobby functionality 2014-07-14 18:01:29 -04:00
Vic Lee 29cb8680ce server: allow partial channel read (fix rdpsnd). 2014-07-14 20:00:38 +08:00
Armin Novak ad3255354d Added WITH_LIBRARY_VERSIONING, allowing to build shared libraries without
SOVERSION information. (required by Android)
2014-07-11 11:53:58 +02:00
Bernhard Miklautz 6a49bcfe40 winpr: always build "monolitic"
winpr is now always build as single library.
The build option MONOLITHIC_BUILD doesn't influence this behavior anymore.

The only exception is winpr-makecert-tool which is still build as extra
library.

This obsoletes complex_libraries for winpr.
2014-07-10 11:10:58 +02:00
Marc-André Moreau 6f1acb01dd channels/rdpgfx: parse H264 bitmap stream and meta block 2014-07-08 17:37:29 -04:00
Marc-André Moreau f7e5365719 libfreerdp-codec: add more gfx H264 debug output 2014-07-08 17:16:13 -04:00
Marc-André Moreau c16000e67b Merge branch 'master' of github.com:FreeRDP/FreeRDP into egfx 2014-07-08 12:29:30 -04:00
Marc-André Moreau 8516846999 libfreerdp-client: cleanup gfx options 2014-07-08 12:29:08 -04:00
Marc-André Moreau a0dad3fa87 Merge branch 'master' of https://github.com/dpoe/FreeRDP into egfx 2014-07-08 12:13:11 -04:00
Emmanuel Ledoux 80f641c38a winpr-comm, serial: excluded Android platforms as well 2014-07-04 17:40:06 +02:00
Emmanuel Ledoux 4fad947cb4 serial: implementation still __linux__ specific (even though not much remains to do to be platform agnostic at this stage) 2014-07-04 16:57:25 +02:00
Emmanuel Ledoux 7bbeff3427 winpr-comm: made its current implementation verific specific to __linux__ since it was done on top of NTTY. 2014-07-04 16:16:26 +02:00
Marc-André Moreau 5c5386fe04 channels/rdpgfx: add egfx command line options and settings 2014-07-03 14:35:03 -04:00
Emmanuel Ledoux d1a7e8c3b8 serial: attempt to avoid a couple compilation warnings: Warning:int-to-pointer-cast 2014-07-03 18:13:25 +02:00
Marc-André Moreau bde954107d Merge branch 'egfx' of github.com:vworkspace/FreeRDP into egfx
Conflicts:
	client/X11/xf_gfx.c
2014-07-03 12:03:39 -04:00
Emmanuel Ledoux e4840d3596 Merge remote-tracking branch 'upstream/master' 2014-07-03 11:56:00 +02:00
Marc-André Moreau 06bdc037a1 Merge pull request #1901 from erbth/master_new
small SmartCard fix and drive redirection hotplug mechanism change
2014-07-02 09:47:59 -04:00
Emmanuel Ledoux b050f5ec56 serial: restored wlog messages using com.freerdp.channel.serial.client. Don't use anymore DEBUG_MSG(), DEBUG_WARN() and DEBUG_SVC() macros 2014-07-02 15:44:29 +02:00