Merge pull request FreeRDP#54 from FreeRDP/remotefx

Remotefx

Makefile.am

@@ -1,9 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 REQUIRED_SUBDIRS = \
 	libfreerdp-asn1 \
-	libfreerdp-gdi \
-	libfreerdp-rfx/sse \
 	libfreerdp-rfx \
+	libfreerdp-gdi \
 	libfreerdp-utils \
 	libfreerdp-core \
 	docs \

X11/xf_win.c

@@ -1073,6 +1073,8 @@ RD_BOOL
 l_ui_check_certificate(rdpInst * inst, const char * fingerprint,
 	const char * subject, const char * issuer, RD_BOOL verified)
 {
+	//char answer;
+
 	printf("certificate details:\n");
 	printf("  Subject:\n    %s\n", subject);
 	printf("  Issued by:\n    %s\n", issuer);
@@ -1081,7 +1083,17 @@ l_ui_check_certificate(rdpInst * inst, const char * fingerprint,
 	if (!verified)
 		printf("The server could not be authenticated. Connection security may be compromised!\n");
 
+#if 0
+	printf("Accept this certificate? (Y/N): ");
+	answer = fgetc(stdin);
+
+	if (answer == 'y' || answer == 'Y')
+		return True;
+	else
+		return False;
+#else
 	return True;
+#endif
 }
 
 static int

configure.ac

@@ -19,7 +19,9 @@ AH_TEMPLATE(IPv6, [IPv6])
 AH_TEMPLATE(NEED_ALIGN, [Alignment])
 AH_TEMPLATE(DISABLE_TLS, [Disable TLS encryption])
 AH_TEMPLATE(WITH_SSE, [Enable SSE Optimizations])
+AH_TEMPLATE(WITH_NEON, [Enable NEON Optimizations])
 AH_TEMPLATE(WITH_XKBFILE, [Use xkbfile for keyboard handling])
+AH_TEMPLATE(WITH_PROFILER, [Turn on the code profiler])
 AH_TEMPLATE(WITH_DEBUG, [Turn on debugging messages])
 AH_TEMPLATE(WITH_DEBUG_RDP, [Turn on debugging messages])
 AH_TEMPLATE(WITH_DEBUG_GDI, [Turn on debugging messages])
@@ -1026,24 +1028,52 @@ AC_ARG_WITH([cunit],
 )
 
 #
-# SSE
+# Profiler
 #
-sse="yes"
-AC_ARG_WITH([sse],
-	[AS_HELP_STRING([--with-sse], [Enable SSE Optimizations [default=yes]])])
-AS_IF([test "x$with_sse" == xno],
+profiler="no"
+AC_ARG_WITH([profiler],
+	[AS_HELP_STRING([--with-profiler], [enable the code profiler])])
+AS_IF([test "x$with_profiler" == xyes],
 	[
-		sse="no"
-		AM_CONDITIONAL(WITH_SSE, false)
+		profiler="yes"
+		AM_CONDITIONAL(WITH_PROFILER, true)
+		AC_DEFINE(WITH_PROFILER,1)
 	],
 	[
-		sse="yes"
+		profiler="no"
+		AM_CONDITIONAL(WITH_PROFILER, false)
+	]
+)
+
+#
+# SSE
+#
+AM_CONDITIONAL(WITH_SSE, false)
+AC_ARG_WITH(sse,
+    [  --with-sse  enable SSE optimizations],
+    [
+        if test $withval != "no";
+        then
 		AM_CONDITIONAL(WITH_SSE, true)
 		AC_DEFINE(WITH_SSE,1)
 		CFLAGS="$CFLAGS -msse2"
-		REQUIRED_SUBDIRS="libfreerdp-rfx/sse $REQUIRED_SUBDIRS"
-	]
-)
+        fi
+    ])
+
+#
+# NEON
+#
+AM_CONDITIONAL(WITH_NEON, false)
+AC_ARG_WITH(neon,
+    [  --with-neon  enable NEON optimizations],
+    [
+        if test $withval != "no";
+        then
+		AM_CONDITIONAL(WITH_NEON, true)
+		AC_DEFINE(WITH_NEON,1)
+		CFLAGS="$CFLAGS -mfpu=neon"
+        fi
+    ])
 
 #
 # X11
@@ -1139,9 +1169,12 @@ AC_CONFIG_FILES([
 Makefile
 freerdp.pc
 libfreerdp-asn1/Makefile
-libfreerdp-gdi/Makefile
 libfreerdp-rfx/Makefile
 libfreerdp-rfx/sse/Makefile
+libfreerdp-rfx/neon/Makefile
+libfreerdp-gdi/Makefile
+libfreerdp-gdi/sse/Makefile
+libfreerdp-gdi/neon/Makefile
 libfreerdp-utils/Makefile
 libfreerdp-core/Makefile
 docs/Makefile