Commit Graph

334 Commits

Author SHA1 Message Date
Marc-André Moreau
a323a0823d Merge branch 'master' of github.com:FreeRDP/FreeRDP 2014-11-28 11:23:53 -05:00
Marc-André Moreau
1385b91ecd cmake: fix FindPulse.cmake version detection 2014-11-28 09:36:38 -05:00
Marc-André Moreau
b793f78281 cmake: fix PulseAudio version detection 2014-11-25 13:28:18 -05:00
Marc-André Moreau
d95af00117 Merge branch 'awakecoding' of github.com:vworkspace/FreeRDP 2014-11-25 11:20:07 -05:00
Mike McDonald
f9097d45c8 Added detection of the pulseaudio version number. 2014-11-21 17:21:00 -05:00
Armin Novak
402cf2064b Fixed OpenH264 detection script. 2014-11-21 10:28:38 +01:00
Bernhard Miklautz
ef5baa52a9 android: update target sdk to 21
Use latest SDK platform (android-21) per default.
2014-11-15 01:04:57 +01:00
Bernhard Miklautz
884ff8fffd android: update toolchain file to support ndk 10c
Toolchain update from https://github.com/taka-no-me/android-cmake/pull/23
2014-11-15 01:03:56 +01:00
Martin Fleisz
6cd55a591d Merge pull request #1964 from akallabeth/thread-wait-support
Implemented thread handling for WaitForMultipleObjects.
2014-11-11 10:50:55 +01:00
Martin Fleisz
d58c6de93c Merge pull request #2134 from akallabeth/windows_version_information
Windows version information
2014-10-31 12:23:11 +01:00
Martin Fleisz
6e1e1def76 Merge pull request #2125 from akallabeth/win_build_fixes
Fixed openssl detection on windows.
2014-10-27 15:00:03 +01:00
Armin Novak
c304f457cf Implemented thread handling for WaitForMultipleObjects.
Implemented thread specific functions.
2014-10-27 11:23:15 +01:00
Manuel Bachmann
d48adecd6c wlfreerdp: initial Wayland client
Implement an initial Wayland client, which will build if
the wayland-client development libraries are detected
(or if -DWITH_WAYLAND:BOOL=ON is set). It is currently
view-only, but inputs will be implemented soon.

It uses the software SHM interface, which means it does not
require GL acceleration to run. It should be compatible
with any compositor

Signed-off-by: Manuel Bachmann <tarnyko@tarnyko.net>
2014-10-13 12:23:23 +02:00
Armin Novak
43faf76a96 Added git function to retrieve current hash. 2014-10-09 16:14:09 +02:00
Armin Novak
bd8d44c6e7 Added dll version information template for windows. 2014-10-03 15:15:53 +02:00
Armin Novak
43d8f34e81 Fixed openssl detection on windows. 2014-09-26 11:16:04 +02:00
Bernhard Miklautz
0313ca3622 libfreerdp: always build "MONOLITHIC"
"libfreerdp" consisted of multiple (small) single libraries. If the cmake
option MONOLITHIC was used only one library was build combining all of
the libfreerdp-* libraries.
The only exceptions to this are libfreerdp-server and libfreerdp-client these
are build as separate libraries.

This commit obsoltes non-monolithic builds and makes monolithic builds
the default. The cmake option MONOLITHIC is also removed.
2014-09-12 00:19:53 +02:00
Marc-André Moreau
a427a46ba5 libfreerdp-primitives: start porting tests to Windows 2014-09-08 16:24:43 -04:00
Gerry Reno
6ecb8131a4 android toolchain: add back setting of ANDROID_SDK 2014-07-14 07:58:32 -04:00
Gerry Reno
9fa451428b cmake: android toolchain set ANDROID_DEFAULT_NDK_API_LEVEL 9 2014-07-13 08:40:58 -04:00
Gerry Reno
a640428905 cmake: android toolchain update to latest upstream
AndroidToolchain.cmake: updated from https://github.com/taka-no-me/android-cmake/raw/master/android.toolchain.cmake
2014-07-13 08:34:48 -04: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
Mike McDonald
4d3d78c487 Initial implementation of H.264 decoder for MS-RDPEGFX 2014-07-01 23:28:09 -04:00
bjcollins
d2d04f764d Find glibconfig.h cmake should use pkgconfig information instead of a hard coded path to /usr/lib.
the OnOpen callback should be called when set to avoid a segfault.
2014-06-27 14:46:27 -05:00
Armin Novak
3b95a356b3 Now requiring target android SDK 14 by default. 2014-06-23 14:17:26 +02:00
Armin Novak
4325741583 Merge remote-tracking branch 'origin/master' into tsmf-gstreamer-1.0
Conflicts:
	client/X11/xf_client.c
2014-06-11 11:27:08 +02:00
Marc-André Moreau
b6a8767b71 libwinpr-smartcard: start smartcard API inspector 2014-05-26 15:57:37 -04:00
Marc-André Moreau
5afd084980 cmake: add option to override default library type for complex submodules 2014-05-26 14:46:42 -04:00
Armin Novak
e3d5413eb8 Removed obsolete gstreamer detection script. 2014-05-24 18:22:05 +02:00
Armin Novak
02649e7322 Added cmake magic to allow selection of gstreamer 1.0 or 0.10 2014-05-24 18:21:40 +02:00
Armin Novak
bcb7c09f5b Updated to gstreamer 1.0 script. 2014-05-23 13:06:51 +02:00
Armin Novak
f8f611f952 Added TSMF debug flag. 2014-05-23 13:06:34 +02:00
Armin Novak
309f19f653 Added new cmake library search functions. 2014-05-23 13:06:03 +02:00
Hardening
729c24cedb Adds some support for valgrind helpers
This patch adds an option to compile freerdp in a valgrind compliant way.
The purpose is to ease memchecking when connecting with TLS. We mark bytes
retrieved from SSL_read() as plainly defined to prevent the undefined contamination.
With the patch and the option activated you get a single warning at connection
during the handshake, and nothing after.
2014-05-12 18:01:29 +02:00
Marc-André Moreau
769502ec72 Merge branch 'master' of github.com:FreeRDP/FreeRDP 2014-04-26 13:47:01 -04:00
Marc-André Moreau
f37c23b1a7 channels/urbdrc: fix cmake scripts 2014-04-26 13:44:58 -04:00
Bernhard Miklautz
d23afa499e export_complex_library add support for long names
If no MODULE is given the first part of LIBNAME is used as module.
The expected format is still MODULE-LIBNAME but now LIBNAME can also
contain -.
2014-04-23 10:14:48 +02:00
Bernhard Miklautz
87294221e7 cmake: remove debug message 2014-04-22 17:22:43 +02:00
Bernhard Miklautz
67cf5bdf39 cmake: add_complex_library add EXPORT parameter
EXPORT is an optional parameter. If set the module is also
marked for export.
2014-04-22 17:05:42 +02:00
Bernhard Miklautz
5ec5ef078c cmake: add export_complex_library function
parameters LIBNAME and MODULE (module)

* adds LIBNAME to a global property ${${MODULE}_EXPORTS}
* if MODULE isn't given LIBNAME is expected to be in the format
  "module-libname"
2014-04-22 16:55:09 +02:00
Marc-André Moreau
3a428b87df libwinpr-smartcard: add option to build statically against specialized pcsclite build 2014-04-08 01:26:28 -04:00
Marc-André Moreau
f4140abd2c cmake: remove unused FindNPP.cmake 2014-02-12 11:51:57 -05:00
Bernhard Miklautz
9148af363e build: cleaned up and fixed PCSC detection 2014-02-09 15:49:33 +01:00
Bernhard Miklautz
7815747d02 smartcard: fix PCSC detection/build on OS X
fixes #1683
2014-02-07 00:14:46 +01:00
Marc-André Moreau
b5bef07e50 wfreerdp: fix building against OpenSSL with MONOLITHIC_BUILD and shared libraries 2014-02-01 19:53:45 -05:00
Marc-André Moreau
839bcb42ae wfreerdp: fix build against static openssl library 2014-01-29 15:27:43 -05:00
Marc-André Moreau
62199fc46a Merge branch 'master' of github.com:FreeRDP/FreeRDP 2013-12-10 11:54:03 -05:00
Bernhard Miklautz
2b6b4a6685 updated file headers 2013-12-04 11:44:22 +01:00
Marc-André Moreau
8f310980ca cmake: fix Android toolchain on 64-bit hosts 2013-12-03 12:10:12 -05:00
Marc-André Moreau
83ad1730b8 Merge branch 'master' of github.com:FreeRDP/FreeRDP
Conflicts:
	libfreerdp/core/input.c
	libfreerdp/core/update.c
2013-11-23 16:39:29 -05:00
Marc-André Moreau
76c842285d channels/rdpsnd: initial attempt at adding GSM610 support 2013-11-22 12:11:39 -05:00
Bernhard Miklautz
c065b0a72f android toolchain: support for ndk r9b 2013-11-19 20:51:51 +01:00
Bernhard Miklautz
aa999c5f62 android toolchain: fixed cmake syntax warning 2013-11-19 20:49:41 +01:00
Bernhard Miklautz
1262d236a3 android build: ignore renderscript toolchain
When detecting toolchains ignore renderscript because its not a
compiler toolchain.
2013-11-18 12:53:17 +01:00
Armin Novak
33c4644c06 Fixed invaid setting of android app default version. 2013-11-08 13:31:04 +01:00
Armin Novak
f00777876d Android App version now configurable from cmake. 2013-11-08 13:15:04 +01:00
Marc-André Moreau
37450da55d cmake: fix exporting of targets on pre-2.8.11 2013-10-29 14:47:40 -04:00
Bernhard Miklautz
7b706ba840 ios build: fixed toolchain for cmake 2.8.10 2013-10-05 21:45:41 +02:00
Armin Novak
f4b68b2d02 Merge branch 'master' of https://github.com/FreeRDP/FreeRDP into android_debug_settings
Conflicts:
	cmake/ConfigOptionsAndroid.cmake
2013-10-02 17:43:14 +02:00
Armin Novak
38323a4568 Implemented debug menu hidden in relase builds. 2013-10-02 14:29:08 +02:00
Bernhard Miklautz
199909e8f1 andriod: removed unecessary config option 2013-10-02 10:24:07 +02:00
Bernhard Miklautz
257a1cb8cc FindOpenSLES: removed debug message 2013-10-02 10:23:06 +02:00
Bernhard Miklautz
4c3ceb6093 android build: set default ndk api level to 9
API level 9 is required in order build the android client with audio
support.
2013-10-01 23:30:58 +02:00
Bernhard Miklautz
6d060d2fcc android build: don't set WITH_OPENSLES in options
WITH_OPENSLES is automatically set by find_feature
2013-10-01 23:22:45 +02:00
Bernhard Miklautz
a5dca8b446 opensles detection: fail required but not found 2013-10-01 23:21:35 +02:00
Bernhard Miklautz
d7a9add3b4 Merge pull request #1514 from akallabeth/android_sound
Android sound support
2013-10-01 02:20:44 -07:00
Bernhard Miklautz
2cb6f5407a Merge pull request #1491 from akallabeth/android_profiler
Android profiler
2013-10-01 00:53:35 -07:00
Armin Novak
0558063a43 Increased mimimum android version to API level 9. Required for OpenSLES. 2013-09-27 11:44:24 +02:00
Armin Novak
cf7d23f7f3 Added CMake configuration options. 2013-09-23 12:38:44 +02:00
Armin Novak
9203473d78 Added OpenSLES detection script. 2013-09-23 12:36:51 +02:00
Armin Novak
14ea8f8b89 Merge branch 'android_build_enhanced' into android_sound 2013-09-19 12:01:33 +02:00
Bernhard Miklautz
c60ea8adb0 Merge pull request #1486 from akallabeth/android_build_enhanced
Android build enhanced
2013-09-19 01:56:53 -07:00
Armin Novak
9846c4496e Renamed android profiler flag to WITH_GPROF 2013-09-18 13:12:52 +02:00
Armin Novak
135ba71c46 Fixed typo in config options for android. 2013-09-17 16:09:45 +02:00
Armin Novak
31bbd368fe Added configuration options for android SDK
Now activating JAVA_DEBUG only for CMake Debug configuration by default.
2013-09-17 15:57:48 +02:00
Marc-André Moreau
2c8bef26de cmake: add target helper functions 2013-09-05 15:20:51 -04:00
Marc-André Moreau
7edfe66274 freerdp: various missing link dependencies and symbol exports 2013-09-03 21:48:26 -04:00
Marc-André Moreau
b0b71ae9b1 Merge pull request #1394 from akallabeth/manpage_merged
Manpage merged
2013-08-14 06:56:27 -07:00
Bernhard Miklautz
553f7c24f7 android: updated toolchain file
* support for ndk version r8d+
* improved x86_64 host machine support
* support non-release NDK layouts
2013-08-08 16:23:11 +02:00
Armin Novak
9b95c55574 Replaced xmlto with xsltproc to word around a bug preventing manpages
to be build, when there are spaces in the build path.
2013-08-06 15:02:36 +02:00
Armin Novak
38be366a67 Fixed generation of configure header, now replacing date fields
with current date.
Added CMake script to generate a variable containing the current
date.
Removed last argument (the terminating NULL element) from output.
2013-08-06 11:54:37 +02:00
Marc-André Moreau
7b80b19306 cmake: add FindPixman.cmake 2013-08-05 20:50:23 -04:00
Marc-André Moreau
ecc543d87d Merge branch 'master' of github.com:FreeRDP/FreeRDP into multitouch 2013-08-03 16:22:09 -04:00
Marc-André Moreau
36f361b2d5 Merge pull request #1389 from akallabeth/urbdrc_cmake_fixes
Urbdrc cmake fixes
2013-08-03 13:18:04 -07:00
Armin Novak
71ec4e5a32 Added libusb detection CMake script. 2013-08-02 15:49:53 +02:00
Armin Novak
3e56dd108a Added proper CMake checks for libraries linked with urbdrc 2013-08-02 15:49:53 +02:00
Marc-André Moreau
1307026a94 freerdp: fix build warnings with MSVC 2013-07-26 15:21:19 -04:00
C-o-r-E
340c3a4246 merged completely (painful) from awakecoding's tree 2013-06-25 20:41:32 -04:00
Marc-André Moreau
31f68d0779 winpr: fix type conflict with X11 2013-06-24 23:58:31 -04:00
Marc-André Moreau
89016d0403 cmake: fix Xrender detection 2013-06-13 10:34:44 -04:00
C-o-r-E
e72b79940c merged upstream 2013-06-05 14:59:24 -04:00
Marc-André Moreau
69706b507e cmake: fix 32-bit clang with SSE 2013-05-31 13:51:50 -04:00
Marc-André Moreau
fc75276128 cmake: add FindNPP.cmake 2013-05-28 01:14:20 -04:00
Marc-André Moreau
9d3ec97f9e freerdp: fix monolithic build with Xcode 2013-05-24 18:38:02 -04:00
C-o-r-E
4c4622aac7 xfreerdp-client: fixed build on OS X 2013-05-21 20:16:14 -04:00
Marc-André Moreau
032fd11928 cmake: check for XITouchClass 2013-05-15 12:40:56 -04:00
Marc-André Moreau
69ece74236 xfreerdp: fix Xrender detection 2013-05-09 15:30:21 -04:00
C-o-r-E
4cdc276e25 merged 2013-05-05 17:57:31 -04:00
Marc-André Moreau
351acdd407 cmake: added PAM detection script 2013-05-03 23:29:04 -04:00
C-o-r-E
9ac3f599d6 xfreerdp-client: initial xrender scaling test 2013-05-02 20:31:22 -04:00
C-o-r-E
327eddbd58 xfreerdp-client: hack cmake for ubuntu imagemagick 2013-05-01 12:39:26 -04:00
Marc-André Moreau
d1e4798372 cmake: fix default server interface option 2013-04-29 19:53:56 -04:00
C-o-r-e
4a9ea669dc xfreerdp-client: Xi build changes 2013-04-25 18:30:39 -04:00
Marc-André Moreau
fc3f75d867 xfreerdp: start experimenting with multitouch 2013-04-25 17:00:43 -04:00
Marc-André Moreau
6322cb9b21 cmake: fix android toolchain with 64-bit ndk 2013-04-09 16:25:15 -04:00
Bernhard Miklautz
62712af114 build: gstreamer detection
fixed build problem on mac
2013-04-03 01:12:39 +02:00
Marc-André Moreau
3835fa8a35 Merge pull request #1152 from mfleisz/master
iOS: Got rid of .xcodeproj file and various compile fixes
2013-04-02 06:07:53 -07:00
Martin Fleisz
5c0440e5fc iOS: removed deprecated cmake options, updated readme 2013-04-02 11:01:59 +02:00
Bernhard Miklautz
81a97144f1 channel/tsmf: fix for gstreamer detection
Print warning if gstreamer is there but xrandr is missing.
2013-03-29 16:17:03 +01:00
Martin Fleisz
f5b4dd8ee9 iOS: iOS doesn't work with monolithic build any more 2013-03-29 14:49:41 +01:00
Marc-André Moreau
690b5147db cmake: simplify android build 2013-03-23 18:13:10 -04:00
Christian Hofstaedtler
3c7a486898 Mac: detect x64 macs
This is needed so WITH_SSE2 is turned on automatically.
2013-03-11 22:05:49 +01:00
Marc-André Moreau
89cf0a3dd0 Merge branch 'master' of github.com:FreeRDP/FreeRDP 2013-03-07 13:56:51 -05:00
Bernhard Miklautz
95a049d96e set CMAKE_COMPILER_ID to GNU in iOS toolchain
The current ios toolchain is GNU based but the iOSToolchain.cmake
set the CMAKE_COMPILER_ID to gcc which isn't known by cmake.
2013-03-05 15:07:27 +01:00
Marc-André Moreau
cd7edbbc81 Merge branch 'master' of github.com:FreeRDP/FreeRDP 2013-03-04 16:07:29 -05:00
Bernhard Miklautz
0d3febe1fc iOS: set CMAKE_SYSTEM_PROCESSOR in toolchain file
This is required that the right architecture is chosen during the cmake run.
Otherwise it is not possible to compile WITH_NEON.
2013-03-01 10:14:33 +01:00
Bernhard Miklautz
f3e1beca58 IPP: disable on arm and apple 2013-03-01 09:02:14 +01:00
Marc-André Moreau
4fd085baaf cmake: remove unused code 2013-02-28 14:54:08 -05:00
Marc-André Moreau
ddf4c6e0ff Merge branch 'master' of github.com:FreeRDP/FreeRDP 2013-02-27 09:38:39 -05:00
Bernhard Miklautz
152071d38b build/arm: added build option to specify fp ABI
cmake option ARM_FP_ABI allows to specify the floating point ABI to use.
If ARM_FP_ABI isn't set explicitly softfp is used.

fixes #980
2013-02-20 01:08:27 +01:00
Marc-André Moreau
470cdb2570 xfreerdp: add async-channels command-line argument 2013-02-19 12:29:15 -05:00
Marc-André Moreau
289aad8d45 Merge branch 'master' of github.com:FreeRDP/FreeRDP 2013-02-15 11:16:36 -05:00
Bernhard Miklautz
e5cf8ff7fb iOS: initial release of iFreeRDP
This is the initial release of iFreeRDP the FreeRDP iOS client.
Build instructions can be found in docs/README.ios.
2013-02-14 14:59:12 +01:00
Marc-André Moreau
d09d368e3f libfreerdp-core: add capabilities debug output 2013-02-12 16:25:16 -05:00
Bernhard Miklautz
f239e1f9c4 aFreeRDP: initial release
This is the initial release of aFreeRDP the FreeRDP Android client.
For build instructions have a look to docs/README.android.
2013-01-29 12:59:58 +01:00
Marc-André Moreau
9373e2549e cmake: fix Mac OS X IPP detection 2013-01-19 20:46:14 -05:00
Marc-André Moreau
1032c69e3f libfreerdp-primitives: fix building with IPP on Linux 2013-01-19 14:27:34 -05:00
Daryl Poe
b64408975d freerdp primitives library 2013-01-18 15:32:58 -07:00
Vic Lee
c5170a00e0 channels/rdpsnd: support wfreerdp using Windows Multimedia API. 2012-12-27 19:20:39 +08:00
Bernhard Miklautz
e004f45968 build: check libavcodec api version
If pkg-config is available libavcodec api version is checked and
cmake fails if the required version isn't available.

In case pkg-config isn't available a notification message with the
required version is printed.

This fixes/prevents #740.
2012-12-16 22:38:09 -05:00
Bernhard Miklautz
7d6f012097 cmake: fixed compatibility with version 2.8.0
* enable_cmake_compat to enable compatibility for specific cmake versions
* added required files for 2.8.2 and 2.8.6 (taken from a recent cmake version)
2012-11-23 14:12:52 +00:00
Marc-André Moreau
e62860ab29 cmake: replace FindOptionalPackage macros with FindFeature macros 2012-11-02 19:27:01 -04:00
Marc-André Moreau
fc1b7896f6 cmake: build for iOS 2012-11-01 17:31:34 -04:00
Marc-André Moreau
b8c33c55da cmake: added iOS toolchain 2012-11-01 13:13:21 -04:00
Marc-André Moreau
187147d399 libfreerdp-core: cleanup of TSG definitions 2012-10-29 15:02:35 -04:00
Marc-André Moreau
4d171408e9 freerdp: merging with master 2012-10-29 09:50:44 -04:00
Bernhard Miklautz
279ae62c5a cunit: deprecate cunit
cunit is not used anymore. Testing is now done with ctest.
2012-10-25 13:43:33 +02:00
Bernhard Miklautz
d6569d945b cmake: make sure build works with cmake < 2.8.3
cmake/compat_2.8.3 contains files required for cmake versions < 2.8.3
and CheckCmakeCompat includes them if necessary.

CMakeParseArguments.cmake and FindPackageHandleStandardArgs.cmake are
taken from the modules shipped with cmake.
2012-10-25 11:22:53 +02:00
Marc-André Moreau
158030c57a libfreerdp-codec: add support for android cpu-features module 2012-10-22 19:01:19 -04:00
Marc-André Moreau
17a5835c08 cmake: added Android toolchain 2012-10-20 00:14:41 -04:00
Marc-André Moreau
81e485736f channels: refactoring of channels cmake scripts with macros 2012-10-17 02:14:19 -04:00
Marc-André Moreau
6a592b5720 cmake: add WITH_SAMPLE, fix inclusion of X11 code 2012-10-13 20:55:28 -04:00
Marc-André Moreau
639bb0d79d cmake: started simplifying monolithic build option 2012-10-13 15:20:39 -04:00
Marc-André Moreau
2ee9f23a8e cmake: revert back to standard CTest BUILD_TESTING option 2012-10-13 09:50:02 -04:00
Marc-André Moreau
e2d3b4454c cmake: add automatic detection of architecture to enable SSE2 by default 2012-10-12 17:55:12 -04:00
Marc-André Moreau
c26a623ed1 cmake: rename BUILD_TESTING to TEST_BUILD 2012-10-12 16:04:46 -04:00
Marc-André Moreau
1931c0d241 cmake: make channels static by default 2012-10-10 17:13:42 -04:00
Marc-André Moreau
40eea7c76b cmake: rename WITH_MONOLITHIC_BUILD to MONOLITHIC_BUILD 2012-10-08 22:55:06 -04:00
Marc-André Moreau
56ea938fbf libwinpr: wrote more tests 2012-10-04 23:19:05 -04:00
Alam Arias
28629aaed0 Revert "build: check libavcodec api version"
This reverts commit 06720e2a8d.
2012-10-04 15:00:12 -04:00