Merge branch 'master' of github.com:awakecoding/FreeRDP

CMakeLists.txt

@@ -26,6 +26,10 @@ if(NOT DEFINED VENDOR)
 	set(VENDOR "FreeRDP" CACHE STRING "FreeRDP package vendor")
 endif()
 
+if(NOT DEFINED FREERDP_VENDOR)
+	set(FREERDP_VENDOR 1)
+endif()
+
 set(CMAKE_COLOR_MAKEFILE ON)
 
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)

client/CMakeLists.txt

@@ -19,36 +19,38 @@
 
 add_subdirectory(common)
 
-if(WIN32)
-	add_subdirectory(Windows)	
-else()
-	if(WITH_SAMPLE)
-		add_subdirectory(Sample)
-	endif()
-
-	if(WITH_DIRECTFB)
-		add_subdirectory(DirectFB)
-	endif()
-endif()
-
-if(WITH_X11)
-	add_subdirectory(X11)
-endif()
-
-if(APPLE)
-	if(IOS)
-		if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/iOS")
-			message(STATUS "Adding iOS client")
-			add_subdirectory(iOS)
-		endif()
+if(FREERDP_VENDOR)
+	if(WIN32)
+		add_subdirectory(Windows)	
 	else()
-		add_subdirectory(Mac)
-	endif()
-endif()
+		if(WITH_SAMPLE)
+			add_subdirectory(Sample)
+		endif()
 
-if(ANDROID)
-	message(STATUS "Adding Android client")
-	add_subdirectory(Android)
+		if(WITH_DIRECTFB)
+			add_subdirectory(DirectFB)
+		endif()
+	endif()
+
+	if(WITH_X11)
+		add_subdirectory(X11)
+	endif()
+
+	if(APPLE)
+		if(IOS)
+			if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/iOS")
+				message(STATUS "Adding iOS client")
+				add_subdirectory(iOS)
+			endif()
+		else()
+			add_subdirectory(Mac)
+		endif()
+	endif()
+
+	if(ANDROID)
+		message(STATUS "Adding Android client")
+		add_subdirectory(Android)
+	endif()
 endif()
 
 # Pick up other clients

server/CMakeLists.txt

@@ -19,27 +19,29 @@
 
 add_subdirectory(common)
 
-if(WITH_SAMPLE)
-	add_subdirectory(Sample)
-endif()
-
-if(NOT WIN32)
-	if(WITH_X11)
-		add_subdirectory(X11)
+if(FREERDP_VENDOR)
+	if(WITH_SAMPLE)
+		add_subdirectory(Sample)
 	endif()
 
-	if(APPLE AND (NOT IOS))
-		add_subdirectory(Mac)
+	if(NOT WIN32)
+		if(WITH_X11)
+			add_subdirectory(X11)
+		endif()
+
+		if(APPLE AND (NOT IOS))
+			add_subdirectory(Mac)
+		endif()
+	else()
+		add_subdirectory(Windows)
+	endif()
+
+	if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/FreeRDS")
+		add_subdirectory("FreeRDS")
 	endif()
-else()
-	add_subdirectory(Windows)
 endif()
 
-if(IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/FreeRDS")
-	add_subdirectory("FreeRDS")
-endif()
-
-# Pick up other clients
+# Pick up other servers
 
 set(FILENAME "ModuleOptions.cmake")
 file(GLOB FILEPATHS RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*/${FILENAME}")

winpr/include/winpr/error.h

@@ -29,10 +29,6 @@
 
 #else
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef NO_ERROR
 #define NO_ERROR    0
 #endif
@@ -3003,6 +2999,10 @@ typedef PTOP_LEVEL_EXCEPTION_FILTER LPTOP_LEVEL_EXCEPTION_FILTER;
 
 typedef LONG (*PVECTORED_EXCEPTION_HANDLER)(PEXCEPTION_POINTERS ExceptionInfo);
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 WINPR_API UINT GetErrorMode(void);
 
 WINPR_API UINT SetErrorMode(UINT uMode);