Commit Graph

440 Commits

Author SHA1 Message Date
Marc-André Moreau 496ce10637 Merge branch 'master' of github.com:FreeRDP/FreeRDP 2014-11-15 12:37:29 -05:00
Marc-André Moreau 734b30a5fd cunit: remove deprecated unit tests 2014-11-12 14:09:53 -05:00
Bernhard Miklautz 2432816711 Update version.
Mark master as "dev" for development ;)
2014-11-12 17:14:47 +01:00
Bernhard Miklautz a668a64488 Don't include CMakeDetermineSystem
According to [1] this is an cmake "internal" module and shouldn't be
included directly.

[1]  http://public.kitware.com/Bug/view.php?id=13796#c31892
2014-11-11 14:40:31 +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
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 4064553818 Initializing BUILD_NUMBER variable now. 2014-10-09 16:16:47 +02:00
Armin Novak 8f74e90807 Fixed git TAG matching, falling back to short hash if no tag exists.
Setting windows version patch level to build number now.
Setting windows version description to GIT_REVISION.
2014-10-09 16:14:24 +02:00
Armin Novak 5364a834c4 Added windows version information to build. 2014-10-03 15:17:40 +02:00
Marc-André Moreau abd87ace55 rdtk: initial commit 2014-09-29 16:08:08 -04: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
Armin Novak 494ca1f1a3 Added winpr functions to generate a stacktrace.
Added libcorkscrew headers for stacktrace on android.
Added execinfo.h detection for stacktrace on linux.
2014-08-14 10:36:50 +02:00
Mike Gilbert ae1fdf6153 Remove execute bit from many files 2014-07-20 00:52:35 -04:00
Marc-André Moreau e6f4754ed3 winpr: improve windows builds across visual studio versions and toolsets 2014-07-17 15:11:04 -04:00
Armin Novak f05e872009 Now usin ON/OFF to set library versioning. 2014-07-11 13:07:36 +02: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 c16000e67b Merge branch 'master' of github.com:FreeRDP/FreeRDP into egfx 2014-07-08 12:29:30 -04:00
Hardening 542811291c Use poll() instead of select() when available
select() has the major drawback that it cannot handle file descriptor
that are bigger than 1024. This patch makes use of poll() instead of
select() when poll() support is available.
2014-07-03 15:26:49 +02:00
Mike McDonald 4d3d78c487 Initial implementation of H.264 decoder for MS-RDPEGFX 2014-07-01 23:28:09 -04:00
Armin Novak 7db8144fbf Fixed git_describe search path. 2014-06-23 13:45:04 +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
Marc-André Moreau 4bac8374de Merge branch 'master' of github.com:FreeRDP/FreeRDP 2014-05-21 11:17:58 -04:00
Hardening 86489f1c9a Merge pull request #1629 from bmiklautz/update_pull_1609
Android jpeg build enhancement
2014-05-20 22:10:17 +02:00
Marc-André Moreau 37b0d634ed freerdp: fix C++ flags for FREERDP_EXPORTS, WINPR_EXPORTS 2014-05-12 19:09:00 -04: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 bbc9fc4393 freerdp: add more vendor options 2014-05-09 12:25:05 -04:00
Bernhard Miklautz 2891c8b445 build: define -D__FILE__ only for Release builds 2014-04-30 12:11:28 +02:00
Bernhard Miklautz 3423ab5b3b build: check c++ compliler flags seperately
Flags for C and C++ compiler need to be checked seperately since
the c and c++ compiler might not support the same flags (even if
they are the same version).
2014-04-30 12:05:51 +02:00
Marc-André Moreau 5db851a154 libwinpr-smartcard: update PCSC-WinPR instructions (WIP) 2014-04-27 17:38:45 -04:00
Marc-André Moreau e0bcc275cc cmake: only use __FILE__ relative path hack in release flags 2014-04-26 14:14:19 -04:00
Marc-André Moreau 769502ec72 Merge branch 'master' of github.com:FreeRDP/FreeRDP 2014-04-26 13:47:01 -04:00
Bernhard Miklautz dee9188191 update and improve pkg-config files
* generate pkg-config files top level to make sure all
  exports are available (eg. client/server)
* .pc libs section is now generated from export libraries
* update .pc file to use .private fields (prevent overlinking)
2014-04-23 13:12:23 +02:00
Marc-André Moreau 784e9abd79 cmake: improve __FILE__ relative path hack 2014-04-21 14:42:24 -04:00
Philippe Coval 677ea5971d fix: build error while running client/X11/generate_argument_docbook
Author: Viacheslav Dubrovsk <dubrsl@altlinux.org>
Bug: https://github.com/FreeRDP/FreeRDP/issues/1481
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
2014-04-16 11:11:24 +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 046a33ba9f cmake: fix debug symbols for C++ code 2014-03-31 13:10:57 -04:00
Marc-André Moreau ac1d819608 cmake: added GCC hack to strip absolute path out of the __FILE__ macro 2014-03-12 13:55:38 -04:00
Marc-André Moreau f4140abd2c cmake: remove unused FindNPP.cmake 2014-02-12 11:51:57 -05:00
Marc-André Moreau 39e64c5808 wfreerdp: fix monolithic static build 2014-02-10 21:07:05 -05:00
Marc-André Moreau d64f86d52c wfreerdp: fix 64-bit build 2014-02-10 00:34:17 -05:00
Marc-André Moreau 17665378a9 wfreerdp: fix target exporting 2014-02-02 22:37:54 -05:00
Benoît LeBlanc 2e0c4c964c Merge branch 'master' of git://github.com/awakecoding/FreeRDP 2013-12-09 16:00:29 -05:00
Hardening f60a1e59f1 Update version number for master 2013-12-09 15:56:13 +01:00
Armin Novak 0793ad3fdf Renamed android specific variables.
Added default path for jpeg specific library.
2013-12-08 14:18:34 +01:00
Benoît LeBlanc 9785275769 Fix warnings 2013-12-05 12:12:55 -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 7457dd3de4 android build: Fixed program path detection 2013-11-18 19:58:01 +01:00
Bernhard Miklautz 391615bcfb android build: generate gprof file only if WITH_GPROF 2013-11-18 12:50:32 +01:00
Marc-André Moreau fa64ca758d Merge branch 'master' of github.com:FreeRDP/FreeRDP 2013-11-15 10:50:30 -05:00
Bernhard Miklautz 916f2d2dbf winpr: fixed build warnings
* moved pthread_tryjoin_np to toplevel CMakeLists.txt
* removed duplicated -DHAVE_PTHREAD_GNU_EXT
2013-11-15 16:04:04 +01:00
Marc-André Moreau b0b8b6aa9e Merge branch 'master' of github.com:FreeRDP/FreeRDP 2013-11-12 12:59:41 -05:00
Armin Novak 0d2fe6997e Fixed output path for JNI header generation script. 2013-11-12 10:21:14 +01:00
Marc-André Moreau 0e662a060e freerdp: improve pkgconfig .pc file generation 2013-11-09 17:51:09 -05:00
Armin Novak 9aa70d4589 Explicitly setting debug format now, as the shipped gdbserver is
not compatible with the default options for all toolchains.
2013-11-08 16:32:50 +01:00
Armin Novak b40123fdff Using new library destination path for android. 2013-11-08 12:48:04 +01:00
Marc-André Moreau 0e1fd4a777 freerdp: merge with master 2013-11-06 13:53:10 -05:00
Bernhard Miklautz a0161a12ac moved version information to freerdp/version.h
fixed #1465
2013-11-06 17:29:33 +01:00
Marc-André Moreau 3b0bcc9824 cmake: export to different directory, export more build info 2013-10-29 15:16:44 -04:00
Marc-André Moreau 37450da55d cmake: fix exporting of targets on pre-2.8.11 2013-10-29 14:47:40 -04:00
Marc-André Moreau c0a1c259f3 freerdp: start exporting targets automatically 2013-10-28 22:09:31 -04:00
Marc-André Moreau 9674c13c3b cmake: don't enable all warnings with clang 2013-10-25 09:48:02 -04:00
Bernhard Miklautz 6d2142182d ios simulator build: set CMAKE_OSX_SYSROOT
When building for iphone simulator it is required to set the CMAKE_OSX_SYSROOT
to "iphonesimulator" otherwise command line builds (with cmake --build) will fail.
2013-10-05 21:47:03 +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 2269cbe155 Merge branch 'master' of https://github.com/FreeRDP/FreeRDP into android_sound 2013-09-27 11:46:48 +02:00
Bernhard Miklautz 47b18ec841 osx build: don't set deployment target
If a deployment target is set within CMakeLists.txt detection might fail
if CMAKE_OSX_SYSROOT isn't set.
In case no deployment target is specified the latest available SDK is used as
deployment target and sysroot is set accordingly.

An other deployment target can still be set with -DCMAKE_OSX_DEPLOYMENT_TARGET=10.x
when running cmake for the first time or can be overwritten in cmake cache
later on.
2013-09-24 01:43:12 +02:00
Bernhard Miklautz b647b5bfc9 some CMakeLists format fixes 2013-09-24 01:41:18 +02:00
Bernhard Miklautz b4ac2ef8c8 osx build: make 10.7 default deployment target
10.6 isn't shipped with xcode > 4.4 anymore per default
If older/newer deployment target is required it can be set with
-DCMAKE_OSX_DEPLOYMENT_TARGET=10.x
2013-09-23 23:29:55 +02:00
Armin Novak e03305f18c Added debugging settings to allow android debugging. 2013-09-23 17:48:02 +02:00
Armin Novak 9f705055bb Android specific build options added. 2013-09-23 12:39:41 +02:00
Marc-André Moreau 929d292f35 wfreerdp: fix compilation 2013-09-19 12:08:20 -04:00
Armin Novak 9846c4496e Renamed android profiler flag to WITH_GPROF 2013-09-18 13:12:52 +02:00
Armin Novak f62b7d74d3 Added profile option for android to build system. 2013-09-18 12:50:10 +02:00
Marc-André Moreau 518995a05e freerdp: merge with master 2013-09-16 17:10:27 -04:00
Marc-André Moreau a26db7a980 Merge branch 'xrdp-ng' of github.com:awakecoding/FreeRDP 2013-09-16 16:46:33 -04:00
Benoît LeBlanc a2f6c2003d Fixing compilation script for support on 10.7, 10.6
NOTE: Wayk-client still does not work on 10.6 because of a missing library used by Qt5.

Dyld Error Message:
  Library not loaded: /usr/lib/libc++.1.dylib
  Referenced from: /Applications/wayk-client.app/Contents/MacOS/../Frameworks/QtCore.framework/Versions/5/QtCore
  Reason: image not found
2013-09-11 10:36:38 -04:00
Marc-André Moreau 7574e7bfc9 Merge branch 'master' of github.com:awakecoding/FreeRDP into xrdp-ng 2013-09-10 17:02:36 -04:00
Marc-André Moreau 78423cb7e8 cmake: fix vendor-specific including 2013-09-10 14:46:48 -04:00
Marc-André Moreau 4a4a36d5c4 cmake: remove vendor-specific options 2013-09-10 14:03:15 -04:00
Marc-André Moreau 8191f4b7b6 cmake: remove debug output 2013-09-10 11:58:43 -04:00
Benoît LeBlanc 525a86280f Caching CMAKE_OSX_DEPLOYMENT_TARGET variable to prevent error on subsequent compilations 2013-09-10 11:45:25 -04:00
Benoît LeBlanc f0e4b7ea21 Merge branch 'master' of git://github.com/awakecoding/FreeRDP
# By Marc-André Moreau
# Via Marc-André Moreau
* 'master' of git://github.com/awakecoding/FreeRDP:
  cmake: remove debug output
  cmake: add vendor-specific packaging extension point
  cmake: fix package generation on Mac OS X
2013-09-10 09:31:49 -04:00
Marc-André Moreau 914d72d449 cmake: remove debug output 2013-09-10 09:27:14 -04:00
Marc-André Moreau ef88801839 cmake: add vendor-specific packaging extension point 2013-09-09 22:25:47 -04:00
Marc-André Moreau 660e904a53 cmake: fix package generation on Mac OS X 2013-09-09 21:42:25 -04:00
Benoît LeBlanc f1ae70fc74 Moved setting CMAKE_OSX_DEPLOYMENT_TARGET at beginning of script file, otherwise the compilation process fails. 2013-09-09 14:12:01 -04:00
Marc-André Moreau f790831e7d Merge branch 'master' of github.com:awakecoding/FreeRDP into xrdp-ng 2013-09-05 15:23:19 -04:00
Armin Novak d80214c7fd Added clang specific compiler warning suppression. 2013-09-05 12:14:33 +02:00
Marc-André Moreau 7edfe66274 freerdp: various missing link dependencies and symbol exports 2013-09-03 21:48:26 -04:00
Marc-André Moreau b480ce1830 freerdp: remove vendor-specific options from build system, add automatic ways of including external clients/servers 2013-09-03 20:37:04 -04:00
Marc-André Moreau 8423fccbc2 libwinpr-pipe: add support for overlapped i/o with named pipes (synchronous, compatible implementation) 2013-08-22 22:36:37 -04:00
Marc-André Moreau 87593b4f19 Merge branch 'master' of github.com:FreeRDP/FreeRDP 2013-08-15 13:16:05 -04:00
Armin Novak c39d99b02d winpr config.h now generated in binary tree. 2013-08-12 13:51:18 +02:00
Armin Novak 2f45f68521 Generating config.h now in binray tree. 2013-08-12 12:53:04 +02:00
Marc-André Moreau bb30ceb006 mfreerdp: cleanup 2013-08-09 21:23:08 -04:00
Marc-André Moreau b164453d75 mfreerdp: fix 32-bit and universal build 2013-08-08 16:10:23 -04:00
Marc-André Moreau 190ed85a3d libwinpr-synch: add detection of timerfd support 2013-08-03 19:50:17 -04:00
Marc-André Moreau ecc543d87d Merge branch 'master' of github.com:FreeRDP/FreeRDP into multitouch 2013-08-03 16:22:09 -04:00
Armin Novak 4d13b27a02 Added proper find_feature check for JPEG library. 2013-08-02 10:04:58 +02:00
Marc-André Moreau 1307026a94 freerdp: fix build warnings with MSVC 2013-07-26 15:21:19 -04:00
Benoît LeBlanc 03a401b8e6 CMakelists:
disabled installation of headers and libraries for the wayk client.
2013-07-25 21:59:21 -04:00
Benoît LeBlanc 6bbcfc0683 Added PDB debug information for windows builds 2013-07-24 15:36:15 -04:00
Marc-André Moreau 863b51f938 freerdp: merge with master 2013-06-28 12:50:24 -04:00
Bernhard Miklautz b91f0bbb90 Merge pull request #1295 from bmiklautz/mac_build_fix
Mac build fix
2013-06-27 11:39:25 -07:00
Bernhard Miklautz edc34d4d02 directfb: print "unmaintained" build warning
directfb client is currently unmaintained
2013-06-18 12:29:30 +02:00
Bernhard Miklautz bcef931755 build: changed X11_FEATURE_TYPE to optional on osX
If X11_FEATURE_TYPE is disables on mac xfreerdp can't be build properly.
Setting it to optional allows to enable X11 builds with -DWITH_X11
2013-06-17 11:14:25 +02:00
Benoît LeBlanc 115b3978c6 Updating common API 2013-06-13 16:18:19 -04:00
Benoît LeBlanc 42f7c7f6b2 Static buid for Mac OS X, mf_interface, WITH_VERBOSE option
mf_interface is still in progress
2013-06-11 14:56:43 -04:00
Marc-André Moreau 69706b507e cmake: fix 32-bit clang with SSE 2013-05-31 13:51:50 -04:00
Marc-André Moreau 12a46784dd mfreerdp: integrate benoit's refactored mac client 2013-05-31 12:48:40 -04:00
Marc-André Moreau fc75276128 cmake: add FindNPP.cmake 2013-05-28 01:14:20 -04:00
Marc-André Moreau 12e5b5fe8d cmake: bump minimum mac os x version to 10.5 (fixes 32-bit build) 2013-05-27 16:00:24 -04:00
Marc-André Moreau d1e4798372 cmake: fix default server interface option 2013-04-29 19:53:56 -04:00
Marc-André Moreau 983f42254d xfreerdp-server: split into library/executable 2013-04-29 16:37:11 -04:00
Marc-André Moreau 4a48266743 cmake: fix 64-bit build with cmake 2.8.8 2013-04-22 16:33:23 -04:00
Marc-André Moreau e7436a1a9d wfreerdp: minor 64-bit fixes 2013-04-10 21:15:38 -04:00
Marc-André Moreau 0cbdd6b641 freerdp: merge with master 2013-04-09 10:18:03 -04:00
Marc-André Moreau dcc7c16ae1 cmake: fix nmake build 2013-04-08 23:08:16 -04:00
Marc-André Moreau 28547bece7 Merge pull request #1162 from mfleisz/cmthirdparty
cmake: Allow project-wide includes for third-party components
2013-04-04 14:23:13 -07:00
Martin Fleisz 0d30f6bf9e cmake: Allow project-wide includes for third-party components 2013-04-04 12:28:52 +02:00
Bernhard Miklautz a4fc5f5c15 Set gstreamer to OPTIONAL on OS X 2013-04-03 01:12:22 +02:00
Martin Fleisz 38446b5f2b iOS: got rid of xcode project file 2013-03-29 14:28:27 +01:00
Marc-André Moreau 690b5147db cmake: simplify android build 2013-03-23 18:13:10 -04:00
Marc-André Moreau 37bb2bda8e cmake: build client/server interfaces by default 2013-03-18 22:29:52 -04:00
Martin Fleisz e3a4d40b61 Android: Fixed JNI regenerate script 2013-03-13 06:02:37 -07:00
Bernhard Miklautz 1be90abcb9 Changed version to 1.1.0-beta1 2013-03-12 20:59:04 +01:00
Marc-André Moreau cd7edbbc81 Merge branch 'master' of github.com:FreeRDP/FreeRDP 2013-03-04 16:07:29 -05: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
Bernhard Miklautz 295d799afe Merge remote-tracking branch 'upstream/master' into androidlib 2013-02-18 15:12:23 +01:00
Bernhard Miklautz 84b2966e67 android: adapted build for library project
- use manifestmerger.enabled to merge library manifest
- updated intent/activities to be implicit
2013-02-18 15:00:55 +01: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 a00ac1f689 Merge pull request #949 from hardening/eventfd
Add support for eventfd
2013-02-02 13:30:33 -08:00
C-o-r-E a39ef9980f Merge remote-tracking branch 'upstream/master' 2013-01-30 19:05:35 -05:00
C-o-r-E c7c9f2f1a6 mfreerdp-server: fixed mstsc bug. 2013-01-30 18:54:08 -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
Bernhard Miklautz 2dee5a1517 build: changed detection for i686/x86_64
Fixes compilation/feature detection on arm.
2013-01-25 14:27:47 +01:00
hardening f0d5e24979 Added preliminary support for eventfd 2013-01-23 21:59:01 +01:00
Daryl Poe b64408975d freerdp primitives library 2013-01-18 15:32:58 -07:00
Corey C 17cd760e0d wfreerdp-server: merge upstream 2013-01-14 14:22:07 -05:00
Martin Fleisz 6bf903afcf cmake: corrected formatting 2012-12-20 04:13:36 -08:00
Martin Fleisz 30cb77835b cmake: fixed errors with Android build 2012-12-20 04:09:33 -08:00
LawrenceK b02765c4c7 Add -march=i686 for 32 bit builds as otherwise defaults to i386 which does not supply one of the intrinsics. 2012-12-18 14:11:04 +00:00
Marc-André Moreau 84f358d3ce Merge pull request #812 from bmiklautz/versioning
build: fixed library versioning
2012-11-25 12:29:29 -08: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
Bernhard Miklautz 9a33dbe826 build: fixed library versioning
Split version numbers into:
FREERDP_API_VERSION - the version of the API which is major.minor
FREERDP_VERSION - version of a release consisting of major.minor.revision (e.g. 1.1.0)
FREERDP_VERSION_FULL - like FREERDP_VERSION but with an optional "build" suffix (e.g 1.1.0-dev)
2012-11-18 17:07:33 +01:00