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
