Merge branch 'ports'

Conflicts: channels/serial/client/serial_tty.c
endriu0 · Jun 30, 2014 · 9fc225a · 9fc225a
2 parents 9e1793c + d93c6b1
commit 9fc225a
Show file tree

Hide file tree

Showing 40 changed files with 8,123 additions and 1,382 deletions.
diff --git a/.gitignore b/.gitignore
@@ -122,3 +122,6 @@ default.log
 *.txt.user
 
 *.autosave
+
+# etags
+TAGS
diff --git a/channels/serial/client/CMakeLists.txt b/channels/serial/client/CMakeLists.txt
@@ -18,9 +18,6 @@
 define_channel_client("serial")
 
 set(${MODULE_PREFIX}_SRCS
-	serial_tty.c
-	serial_tty.h
-	serial_constants.h
 	serial_main.c)
 
 add_channel_client_library(${MODULE_PREFIX} ${MODULE_NAME} ${CHANNEL_NAME} TRUE "DeviceServiceEntry")
@@ -32,6 +29,11 @@ set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
 	MODULE freerdp
 	MODULES freerdp-utils)
 
+set_complex_link_libraries(VARIABLE ${MODULE_PREFIX}_LIBS
+	MONOLITHIC ${MONOLITHIC_BUILD}
+	MODULE winpr
+	MODULES winpr-comm)
+
 target_link_libraries(${MODULE_NAME} ${${MODULE_PREFIX}_LIBS})
 
 install(TARGETS ${MODULE_NAME} DESTINATION ${FREERDP_ADDIN_PATH} EXPORT FreeRDPTargets)

diff --git a/channels/serial/client/serial_constants.h b/channels/serial/client/serial_constants.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -122,3 +122,6 @@ default.log @@
     *.txt.user
     *.autosave
+    # etags
+    TAGS