Armin Novak
1868acb0ac
Using ICU instead of custom unicode conversion.
...
If WITH_ICU CMake option is set the unicode conversion routines
use ICU instead of custom conversion code.
2017-07-26 13:00:45 +02:00
Bernhard Miklautz
1a4cfa05cc
Don't use an option for WITH_GFX_H264
...
CMAKE_DEPENDENT_OPTION the option is initialized on the first run and
then saved. Later configuration changes are not considered anymore.
Therefor use an variable instead of an option here.
2017-07-19 09:46:07 +02:00
Armin Novak
e09b6a9f84
Fixed config option.
2017-07-17 10:56:45 +02:00
Armin Novak
e3aa889e9d
Disable WITH_GFX_H264 if no backend compiled in.
2017-07-17 09:32:34 +02:00
Armin Novak
5764d5a78a
Disable GFX H264 if no backend compiled in.
2017-07-17 09:25:21 +02:00
Armin Novak
ec0992e938
Added pkg-config to cmake OpenH264 detection.
2017-05-10 12:35:20 +02:00
David PHAM-VAN
c7924b554d
Rewrite drive channel using WinPR functions
2017-03-13 14:18:46 -07:00
Armin Novak
50cd702a15
Updated KRB5 detection, added error case handler
...
* Linking against KRB5 library now, no dynamic usage.
* Added proper CMake detection script for KRB5 detection
* Added some additional error conditions.
2017-02-21 10:54:34 +01:00
Armin Novak
9158fe0e3e
Support old CMake versions without TIMESTAMP #3727
2017-01-31 16:53:04 +01:00
Martin Fleisz
ac12d46f27
Merge pull request #3715 from akallabeth/reproducible_build
...
Reproducible build
2017-01-26 11:10:17 +01:00
Armin Novak
a14892773c
Added CCACHE detection and option to disable.
2017-01-25 09:05:27 +01:00
Armin Novak
00d71f6216
Use CMake TIMESTAMP, remove newline from TODAY
2017-01-24 11:12:15 +01:00
Bernhard M. Wiedemann
3606a42c52
make build reproducible
...
by allowing build systems to use a constant date instead of the current one
see https://reproducible-builds.org/ for why this is good
and https://reproducible-builds.org/specs/source-date-epoch/
for the definition of this variable
This call is designed to work with GNU date. If BSD support is a concern, it can be added.
2017-01-23 09:52:13 +01:00
Bernhard Miklautz
14d076735e
Merge pull request #3705 from akallabeth/android_openssl_1_1
...
Android openssl 1 1
2017-01-19 12:05:26 +01:00
Armin Novak
548927eb2e
Renamed OpenSSL library
...
To avoid collisions with system provided OpenSSL use
a different (unique) library name for android builds.
2017-01-16 16:39:06 +01:00
Bernhard Miklautz
d817469b78
Install man pages
...
* man pages are only build/installed if WITH_MANPAGES is enabled
* create a new cmake function install_freerdp_man to unified install man
pages
* install all man pages using the new function
* update the nightly packages accordingly
2017-01-16 11:34:32 +01:00
Norbert Federa
f71b6b46e8
fix string format specifiers
...
- fixed invalid, missing or additional arguments
- removed all type casts from arguments
- added missing (void*) typecasts for %p arguments
- use inttypes defines where appropriate
2016-12-16 13:48:43 +01:00
Armin Novak
930045ef12
Added leak detector option, made conflicting options exclusive.
2016-10-10 09:29:09 +02:00
Armin Novak
9c64e77a84
Disabled thread local storage on iOS.
...
iOS does not support Thread Local Storage.
Disabling it for now until a solution is found.
Print a compiler warning informing developers about this issue.
2016-10-06 13:43:10 +02:00
Armin Novak
b719178a8f
Removed obsolete DEBUG_GDI
2016-10-06 13:43:02 +02:00
Armin Novak
bc49c16c60
Removed obsolete options.
2016-10-06 13:43:02 +02:00
Armin Novak
3c8d0bbeab
Added address sanitizer to options.
2016-10-06 13:43:02 +02:00
Martin Fleisz
3586e33866
Merge pull request #3435 from akallabeth/uuid_find_fix
...
CMake FindUUID fixes.
2016-08-25 09:00:56 +02:00
Marc-André Moreau
a04f3242a1
cmake: fix Android toolchain missing usage of CMAKE_PREFIX_PATH
2016-07-19 21:53:23 -04:00
Norbert Federa
89c25276b4
Merge pull request #3384 from akallabeth/android64_build
...
Android64 build fixes
2016-07-06 13:58:10 +02:00
Armin Novak
b7f8dc3d43
Fixed UUID find.
2016-06-27 10:37:24 +02:00
Norbert Federa
90cdfa7646
cmake: replaced STATIC_CHANNELS with BUILTIN_CHANNELS
2016-06-15 13:36:27 +02:00
Armin Novak
20568af6a4
Updated toolchain file, added new variable for lib64 detection.
2016-06-03 13:02:13 +02:00
Armin Novak
10460d3ebc
Fixed android library detection.
2016-06-03 13:01:59 +02:00
Marc-André Moreau
915b9a15b1
Merge branch 'master' of github.com:FreeRDP/FreeRDP
...
Conflicts:
winpr/libwinpr/bcrypt/CMakeLists.txt
2016-05-11 11:05:17 -04:00
Bernhard Miklautz
2c0e73b075
client: disable the client interface per default
...
libxfreerdp-client doesn't necessarily provide a stable interface
therefore it isn't built and installed anymore per default.
To archive the same behavior as before this change -
libxfreerdp-client.so built and a library version set - use
-DWITH_CLIENT_INTERFACE=ON -DCLIENT_INTERFACE_SHARED=ON
when running cmake.
This also fixes the build on windows without WITH_CLIENT_INTERFACE
enabled.
2016-05-09 12:20:38 +02:00
Bernhard Miklautz
81d30cc480
Disable comm tests per default
...
comm tests require a serial device for testing. If the test environment
isn't available the tests will return errors therefore the tests are
now disabled per default. They can be (re-)enabled by using the cmake
option BUILD_COMM_TESTS.
2016-05-02 16:59:25 +02:00
Bernhard Miklautz
4a9da95b0d
Tests: Disable TESTS_WTSAPI_EXTRA per default
...
TESTS_WTSAPI_EXTRA was mistakenly always enabled if BUILD_TESTING
was enabled.
2016-04-19 12:46:54 +02:00
Marc-André Moreau
4d629a7999
freerdp: UWP porting
2016-03-29 16:03:15 -04:00
Bernhard Miklautz
5a7ac964c3
build/win32: fix DLL version information
...
Swap build and patch.
Now uses the format major.minor.patch.build
2016-02-29 16:00:35 +01:00
Bernhard Miklautz
541abee480
cmake/FindWayland: cleanup
...
* use consistent naming
* remove trailing blanks
2016-02-25 21:57:56 +01:00
David FORT
c1c43f91c7
Fixed detection of wayland libs
2016-02-23 14:09:53 +01:00
David FORT
5dcb3dfe8b
Fix compilation and detection under debian/ubuntu
2016-02-23 14:09:53 +01:00
David FORT
87d6caa69a
Integrate UWAC in to the FreeRDP source tree
...
So the wayland client can still be built without installing UWAC as a dependency.
2016-02-23 14:09:53 +01:00
David FORT
bc31c00865
Fixed detection of UWAC library
2016-02-23 14:09:53 +01:00
David FORT
ded17d9d0c
Move wayland client to UWAC
2016-02-23 14:09:53 +01:00
Martin Fleisz
56a0c4c336
Merge pull request #3097 from akallabeth/android_api_upgrade_v4
...
Android api upgrade and restructuring
2016-02-04 16:20:59 +01:00
David PHAM-VAN
506749b93c
Activate WITH_MACAUDIO flag if the build is for OS X
2016-02-02 11:58:05 -08:00
Armin Novak
61633a1c66
Fixed android build issues.
2016-02-01 15:21:07 +01:00
Bernhard Miklautz
b8136a3769
build: remove FREERDP_MONOLITHIC_BUILD
...
FREERDP_MONOLITHIC_BUILD was obsolete for a while and unused
2016-01-12 17:32:32 +01:00
Armin Novak
197ba27d72
Changed symbol install to OFF.
2015-12-15 17:19:58 +01:00
Armin Novak
cb958ba9c6
Added pdb files to package target.
...
Fixed name collision with freerdp-shadow targets.
2015-12-15 12:07:21 +01:00
Armin Novak
7b371560fc
Fixed cmake_dependent_option use.
2015-11-10 14:20:02 +01:00
Armin Novak
9b7c35e122
Fixed WITH_CLIENT_CHANNELS dependencies.
2015-11-04 13:15:37 +01:00
Armin Novak
1ba4f9b67f
Added WITH_CLIENT_COMMON option.
2015-11-04 09:53:13 +01:00
David FORT
9ea301983d
Adds a systemd journal appender
2015-10-30 14:50:14 +01:00
Bernhard Miklautz
7aca1e0dc5
Merge pull request #2910 from dupondje/master
...
FindGStreamer_1_0: fix build failure for new gstreamer versions
2015-10-16 10:38:11 +02:00
Jean-Louis Dupond
bea27fd919
FindGStreamer_1_0: fix build failure for new gstreamer versions
2015-10-04 18:17:33 +02:00
Marc-André Moreau
8e3baed882
cmake: add mbed TLS detection
2015-09-15 20:52:46 -04:00
Armin Novak
4ed701bf35
media foundation support now a compile time option.
2015-08-11 07:58:43 +02:00
Marc-André Moreau
9400ccb4bc
libfreerdp-codec: add x264 stubs
2015-07-28 16:01:34 -04:00
Marc-André Moreau
ddf2519f1e
Merge pull request #2719 from bmiklautz/pull/2481
...
OSS, tsmf, usb and BSD fixes and improvements
2015-06-26 08:27:22 -04:00
Bernhard Miklautz
749d93ae39
client/android: misc updates and fixes
...
* increase minimum required SDK to 14
* change functions from void to BOOL where required to have proper
return values
* update the JAVA classes and JNI accordingly
* add return value checks for *alloc and strdup
2015-06-22 19:10:00 +02:00
ivan-83
83a40a32a7
* tsmf: OSS code cleanup
...
+ urbdrc: add devd support (not tested)
* fix FindUUID detection ubder BSD
* wlog: fix prev commit: build error on Windows
* cmdline: add /usb syntax help
2015-05-27 22:58:41 +03:00
Marc-André Moreau
4c5ac6cfb0
cmake: add PULSE_FOUND variable to FindPulse.cmake
2015-05-20 11:27:36 -04:00
Mike Gilbert
2355b54f85
Remove the ARM_FP_ABI option
...
It's unclear why this option would be necessary, and it causes problems
when people do not match it to their toolchain and CFLAGS.
To set the float abi, either use a toolchain with an appropriate default
or set the float-abi option in the CFLAGS environment variable.
This should resolve #2586 .
2015-05-01 17:35:21 -04:00
Armin Novak
ac15ce2da8
Added mutex debug flag.
...
When mutex debugging is enabled now a stack trace
is logged, if a mutex is locked on destruction.
2015-04-28 08:55:49 +02:00
Hardening
6cd7713e12
Merge pull request #2544 from bmiklautz/boolenization
...
change return types of callbacks to BOOL
2015-04-22 11:01:27 +02:00
Bryan Everly
8c75127a67
Necessary changes to get latest branch working on OpenBSD 5.6
2015-04-21 14:42:06 -04:00
Bernhard Miklautz
43695bc15d
ios: updates to build with xcode6+
...
* update tool chain to use clang instead of gcc
* add compatibility function for fwrite
2015-04-21 14:16:32 +02:00
Armin Novak
de4d571208
Added openh264_dll to library name hints.
2015-03-25 10:41:40 +01:00
ivan-83
4f8f84f33b
+ some files for OSS, missed from prev commit
2015-03-09 09:31:27 +03:00
Andreas Bergmeier
08cd9a0a2f
Added support for finding OpenSLES with CMake + Android.
2015-03-01 21:16:56 +01:00
Bernhard Miklautz
67fb97f68f
wtsapi: add TestWtsApiExtra
...
Move wtsapi tests that only make sense when run within a session
("interactive") to TestWtsApiExtra since they either brake automated
builds or don't make sense if the return value isn't checked.
TestWtsApiExtra is not build by default but can be enabled by specifying
-DTESTS_WTSAPI_EXTRA=ON (this option is only available if BUILD_TESTING
is enabled).
The tests set the ctest label WTSAPI_EXTRA and can therefore also
be run explicitly with ctest -L WTSAPI_EXTRA.
2015-02-10 18:05:40 +01:00
Petr Sumbera
8510373b04
Fixes Solaris bus error on sparc.
2015-02-05 08:46:56 -08:00
Marc-André Moreau
8f8676a20e
Merge pull request #2355 from xsumbe00/master
...
Fixes some build issues on Solaris 11.
2015-02-04 11:34:02 -05:00
Marc-André Moreau
261f493b04
Merge pull request #2340 from akallabeth/openssl_detection_fix
...
Openssl detection fix
2015-02-04 11:31:49 -05:00
Petr Sumbera
68619b660b
"ar" and zero or several 'm' matches also to "sparc". Adding '^' at the begiinning seems like the safest option.
2015-02-03 13:14:40 -08:00
Bernhard Miklautz
c228860082
ringbuffer: add option to enable/disable debugging
...
Add option WITH_DEBUG_RINGBUFFER to enable/disable ringbuffer debugging
at compile time.
Even if it is possible to filter specific wlog tags it's not yet
possible to exclude one or more and ringbuffer adds massive debugging
output if enabled and WLOG_LEVEL is set to DEBUG.
2015-02-03 15:28:05 +01:00
Armin Novak
6229d6218e
Added additional search path suffix for OpenH264.
2015-01-30 08:54:10 +01:00
Armin Novak
b5c7093477
Fixed OpenSSL version regex
...
Starting with OpenSSL 1.0.2 source code is reformatted.
This patch takes care of the differences in the define
spacing.
2015-01-30 08:54:10 +01:00
Bernhard Miklautz
421d5858e9
build: set minimum wayland version to 1.3.0
2015-01-21 12:33:39 +01:00
Bernhard Miklautz
9f27000518
build: improve wayland detection
...
* add support to check wayland client version
* set minimum required version to 0.95
2015-01-18 22:23:50 +01:00
Bernhard Miklautz
b35dc849ee
build: improve X11 detection on OS X
...
/usr/X11R6 doesn't exist on OS X per default (anymore). Therefore add
PATHS to all X11 detection modules pointing to the Xquarz installation
directory in /opt/X11.
For FindX11 it was also necessary to ensure that the frameworks are
searched as last (after PATHS) otherwise it could happen that X11 headers
of a framework (e.g. Tk.framework) were used.
2014-12-12 17:43:14 +01:00
Marc-André Moreau
ae4a8bdc70
cmake: fix PulseAudio.cmake version detection
2014-12-04 14:06:29 -05:00
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