Merge pull request FreeRDP#1215 from mfleisz/andrclip

Android: Added clipboard redirection support
davidleake · Apr 29, 2013 · 5ac16b9 · 5ac16b9
2 parents 15a22eb + a170857
commit 5ac16b9
Show file tree

Hide file tree

Showing 16 changed files with 1,157 additions and 121 deletions.
diff --git a/client/Android/FreeRDPCore/jni/CMakeLists.txt b/client/Android/FreeRDPCore/jni/CMakeLists.txt
@@ -33,13 +33,21 @@ set(${MODULE_PREFIX}_SRCS
 	android_event.h
 	android_freerdp.c
 	android_freerdp.h
+	android_jni_utils.c
+	android_jni_utils.h
 	android_jni_callback.c
 	android_jni_callback.h)
 
 set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS}
 	generated/android_freerdp_jni.c
 	generated/android_freerdp_jni.h)
 
+if(WITH_CLIENT_CHANNELS)
+	set(${MODULE_PREFIX}_SRCS ${${MODULE_PREFIX}_SRCS}
+		android_cliprdr.c
+		android_cliprdr.h)
+endif()
+
 add_library(${MODULE_NAME} SHARED ${${MODULE_PREFIX}_SRCS})
 
 set(${MODULE_PREFIX}_LIBS ${${MODULE_PREFIX}_LIBS} freerdp-client)