mfreerdp: fix 32-bit and universal build

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dce790c..3ee222e 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -231,17 +231,14 @@ if(APPLE)
                         include_directories(/opt/local/include)
                         link_directories(/opt/local/lib)
                 endif()
-                set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.5")
         endif()
+
         if(WITH_CLANG)
                 set(CMAKE_C_COMPILER "clang")
         endif()
 
         if (WITH_VERBOSE)
-            # Support for automatic reference counting requires non-fragile abi.
             set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -v")
-
-            # Tell the compiler where to look for the FreeRDP framework
             set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -v")
         endif()
 endif()

diff --git a/client/Mac/CMakeLists.txt b/client/Mac/CMakeLists.txt
index 6f26274..ffb565c 100755 (executable)
--- a/client/Mac/CMakeLists.txt
+++ b/client/Mac/CMakeLists.txt
@@ -65,9 +65,6 @@ set_target_properties(${MODULE_NAME} PROPERTIES
        RUNTIME_OUTPUT_DIRECTORY_DEBUG ${EXECUTABLE_OUTPUT_PATH} 
        RUNTIME_OUTPUT_DIRECTORY_RELEASE ${EXECUTABLE_OUTPUT_PATH})
 
-# Support for automatic reference counting requires non-fragile abi.
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fobjc-nonfragile-abi")
-
 set_target_properties(${MODULE_NAME} PROPERTIES 
        FRAMEWORK TRUE
        MACOSX_FRAMEWORK_IDENTIFIER com.awakecoding.${MODULE_NAME}

diff --git a/client/Mac/cli/CMakeLists.txt b/client/Mac/cli/CMakeLists.txt
index 09933a3..2d14e37 100644 (file)
--- a/client/Mac/cli/CMakeLists.txt
+++ b/client/Mac/cli/CMakeLists.txt
@@ -4,7 +4,6 @@ project(MacFreeRDP)
 set(MODULE_NAME "MacFreeRDP")
 set(MODULE_OUTPUT_NAME "MacFreeRDP")
 set(MODULE_PREFIX "FREERDP_CLIENT_MAC_CLIENT")
-set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -mmacosx-version-min=10.5")
 
 # Import libraries
 find_library(FOUNDATION_LIBRARY Foundation)
@@ -62,9 +61,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Info.plist ${CMAKE_CURRENT_BINARY_DIR
 # This allows for automatic xib to nib ibitool
 set_target_properties(${MODULE_NAME} PROPERTIES RESOURCE "${${MODULE_PREFIX}_RESOURCES}")
 
-# Support for automatic reference counting requires non-fragile abi.
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fobjc-nonfragile-abi")
-
 # Tell the compiler where to look for the FreeRDP framework
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -F../")