Commit Graph

318 Commits

Author SHA1 Message Date
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