Commit Graph

110 Commits

Author SHA1 Message Date
Armin Novak
8fa18f1174 Using winpr instead of pthread now.
<android_desktop_resize> now uses up to date settings for callback now.
Improved error handling in <jni_input_thread>
Unified disconnect and cancel JNI calls, as they currently do the same.
2013-11-12 10:30:14 +01:00
Armin Novak
3b209b9345 Removed pthreads, using winpr now. 2013-11-12 10:25:41 +01:00
Armin Novak
2af8efb26b Fixed resource cleanup, using DEBUG_WARN now for error messages. 2013-11-12 10:24:13 +01:00
Armin Novak
f93b69320f Split ndk-build and ant runs to different targets, ndk-build is now also
run, if no ant build is desired.
2013-11-12 10:23:22 +01:00
Armin Novak
83053c865a DEBUG_ANDROID now a debug define using default <debug.h> macros. 2013-11-12 10:22:41 +01:00
Armin Novak
f6236048c5 Modified build to allow native debugging with eclipse. 2013-11-08 15:20:23 +01:00
Armin Novak
fdc3045839 Modified build to allow native debugging with eclipse. 2013-11-08 15:19:38 +01:00
Armin Novak
ba2c31e9d9 Modified build to allow native debugging with eclipse. 2013-11-08 15:16:18 +01:00
Armin Novak
d1bc0d6f37 Enabled native building support. 2013-11-08 13:40:05 +01:00
Armin Novak
f00777876d Android App version now configurable from cmake. 2013-11-08 13:15:04 +01:00
Armin Novak
105a859694 Setting correct debuggable now depending on configuration. 2013-11-08 12:51:01 +01:00
Armin Novak
51041bd1bc Modified ant build target. 2013-11-08 12:46:32 +01:00
Armin Novak
9799520803 Added ndk-build detection. 2013-11-08 12:44:28 +01:00
Armin Novak
dc055782e8 Modified ant build target. 2013-11-08 12:42:41 +01:00
Armin Novak
017308b796 Added generation of android ndk build scripts. 2013-11-08 12:37:38 +01:00
Armin Novak
9eedf16ef0 Added native android build scripts. 2013-11-08 12:08:06 +01:00
Armin Novak
f3bfef8da5 Resource cleanup fixes. 2013-11-08 10:27:16 +01:00
Armin Novak
051892a8b1 Fixed typo.
Fixed XML menu configuration.
2013-10-04 11:43:42 +02:00
Armin Novak
a9c351a0ae Moved async settings to debug menu.
Fixed classpath settings for aFreeRDP project.
2013-10-04 11:30:51 +02:00
Armin Novak
d7ee71cc8b Merge branch 'master' of https://github.com/FreeRDP/FreeRDP into android_async
Conflicts:
	client/Android/FreeRDPCore/.classpath
	client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/domain/BookmarkBase.java
	client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/BookmarkBaseGateway.java
	client/Android/FreeRDPCore/src/com/freerdp/freerdpcore/services/BookmarkDB.java
2013-10-04 10:04:03 +02:00
Bernhard Miklautz
5c61ac97cb Merge pull request #1524 from akallabeth/android_debug_settings
Add debug settings menu for android

Menu needs to be activated with cmake with -DWITH_ANDROID_DEBUG_MENU=ON
2013-10-03 05:36:42 -07:00
Bernhard Miklautz
a88ed35a0a android: fixed classpaths
fixes #1526
2013-10-03 13:28:31 +02:00
Armin Novak
38323a4568 Implemented debug menu hidden in relase builds. 2013-10-02 14:29:08 +02:00
Armin Novak
16936dc061 Added CMake generated BuildConfiguration java class. 2013-10-02 10:24:44 +02:00
Armin Novak
836ccc28b2 Added missing assert. 2013-10-01 16:23:17 +02:00
Armin Novak
83a64e99ea Merge branch 'android_async' of github.com:akallabeth/FreeRDP into android_async
Conflicts:
	client/Android/FreeRDPCore/.classpath
	client/Android/FreeRDPCore/jni/android_freerdp.c
2013-10-01 16:22:27 +02:00
Armin Novak
3910d512fa Implemented async_input handling. 2013-10-01 16:17:52 +02:00
Armin Novak
b2236b7a4d Implemented async_channels, async_transport and async_update. 2013-10-01 16:17:26 +02:00
Armin Novak
111d0c670c Added new advanced configuration options for async. 2013-10-01 16:16:37 +02:00
Bernhard Miklautz
d7a9add3b4 Merge pull request #1514 from akallabeth/android_sound
Android sound support
2013-10-01 02:20:44 -07:00
Armin Novak
627e6ce4d5 Renamed configuration options, translations still missing... 2013-10-01 11:05:34 +02:00
Armin Novak
fe336da721 Implemented async_input handling. 2013-10-01 10:33:28 +02:00
Bernhard Miklautz
2cb6f5407a Merge pull request #1491 from akallabeth/android_profiler
Android profiler
2013-10-01 00:53:35 -07:00
Armin Novak
2fec8ad4c8 Implemented async_channels, async_transport and async_update. 2013-09-30 17:52:13 +02:00
Armin Novak
1e041d1952 Added new advanced configuration options for async. 2013-09-30 16:33:45 +02:00
Armin Novak
84610f02e7 Sound redirection in android client now allows selecting server side sound. 2013-09-27 13:45:41 +02:00
Armin Novak
d81421a76a Fixed android shutdown crash.
Added new permissions required for microphone redirection.
Fixed JNI call for microphone redirection.
2013-09-27 11:41:25 +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
Armin Novak
0d9ab7ce6a Added new advanced configuration options to redirect sound and microphone.
Added JNI settings for sound and microphone redirection.
2013-09-19 13:45:16 +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
767425f259 Added profiler code to startup and shutdown functions. 2013-09-18 12:50:28 +02:00
Armin Novak
5fb9cacd5c Fixed android SDK version, now using variable. 2013-09-17 16:16:02 +02:00
Armin Novak
d8db198a51 Fixed out of source build. 2013-09-17 16:09:31 +02:00
Armin Novak
ef3f534825 Fixed out of source build. 2013-09-17 16:09:04 +02:00
Armin Novak
b58942b0cc Fixed out of source build. 2013-09-17 16:07:52 +02:00
Marc-André Moreau
518995a05e freerdp: merge with master 2013-09-16 17:10:27 -04:00
Todd McKinney
36e7c3914a Clean up unneded includes and fix logic for display output to include fitscreen text 2013-09-16 09:50:32 -05:00