freerdp: merge with master

diff --cc .gitignore
Simple merge

diff --cc CMakeLists.txt
index 217ea1a,49099d7..80531b4
--- 1/CMakeLists.txt
--- 2/CMakeLists.txt
+++ b/CMakeLists.txt
@@@ -170,15 -174,8 +170,15 @@@ if(MSVC
        SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
  endif()
  
 +if(WIN32)
 +      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUNICODE -D_UNICODE")
 +      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_WIN32_WINNT=0x0501")
 +      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS")
 +      set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWIN32_LEAN_AND_MEAN")     
 +endif()
 +
  if(IOS)
-       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -isysroot ${CMAKE_IOS_SDK_ROOT}")
+       set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -isysroot ${CMAKE_IOS_SDK_ROOT} -g")
  endif()
  
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DWINPR_EXPORTS")

diff --cc include/freerdp/settings.h
Simple merge

diff --cc libfreerdp/common/settings.c
Simple merge