Merge pull request #706 from atong/master

macos build
This commit is contained in:
Marc-André Moreau 2012-08-24 09:10:16 -07:00
commit eafb5b817f
8 changed files with 22 additions and 23 deletions

View File

@ -38,3 +38,7 @@ else()
# Build Windows Client # Build Windows Client
add_subdirectory(Windows) add_subdirectory(Windows)
endif() endif()
if(APPLE)
add_subdirectory(Mac)
endif()

View File

@ -9,9 +9,6 @@ include(CheckStructHasMember)
include(FindPkgConfig) include(FindPkgConfig)
include(TestBigEndian) include(TestBigEndian)
# Include our extra modules
set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/../../cmake/)
include(AutoVersioning) include(AutoVersioning)
include(ConfigOptions) include(ConfigOptions)
include(FindOptionalPackage) include(FindOptionalPackage)
@ -114,7 +111,8 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/Info.plist ${CMAKE_CURRENT_BINARY_DIR
set_target_properties(MacFreeRDP PROPERTIES RESOURCE "${MacFreeRDP_XIBS}") set_target_properties(MacFreeRDP PROPERTIES RESOURCE "${MacFreeRDP_XIBS}")
# Automatic ref counting # Automatic ref counting
set_target_properties(MacFreeRDP PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES) # temporary turn off for x86_64 build issue
# set_target_properties(MacFreeRDP PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES)
# Support for automatic reference counting requires non-fragile abi. # Support for automatic reference counting requires non-fragile abi.
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fobjc-nonfragile-abi") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fobjc-nonfragile-abi")
@ -135,12 +133,13 @@ if(NOT WIN32)
find_optional_package(MacAudio) find_optional_package(MacAudio)
endif() endif()
# Add all libraries target_link_libraries(MacFreeRDP
target_link_libraries(MacFreeRDP ${EXTRA_LIBS}) ${EXTRA_LIBS}
target_link_libraries(MacFreeRDP ${CMAKE_SOURCE_DIR}/../../xcode/libfreerdp-core/Debug/libfreerdp-core.dylib) freerdp-core
target_link_libraries(MacFreeRDP ${CMAKE_SOURCE_DIR}/../../xcode/libfreerdp-channels/Debug/libfreerdp-channels.dylib) freerdp-channels
target_link_libraries(MacFreeRDP ${CMAKE_SOURCE_DIR}/../../xcode/libfreerdp-cache/Debug/libfreerdp-cache.dylib) freerdp-cache
target_link_libraries(MacFreeRDP ${CMAKE_SOURCE_DIR}/../../xcode/libfreerdp-gdi/Debug/libfreerdp-gdi.dylib) freerdp-gdi
target_link_libraries(MacFreeRDP ${CMAKE_SOURCE_DIR}/../../xcode/libfreerdp-utils/Debug/libfreerdp-utils.dylib) freerdp-utils
target_link_libraries(MacFreeRDP ${CMAKE_SOURCE_DIR}/../../xcode/libfreerdp-codec/Debug/libfreerdp-codec.dylib) freerdp-codec
target_link_libraries(MacFreeRDP ${CMAKE_SOURCE_DIR}/../../xcode/libfreerdp-rail/Debug/libfreerdp-rail.dylib) freerdp-rail
)

View File

@ -8,8 +8,6 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#define boolean int
#include "freerdp/graphics.h" #include "freerdp/graphics.h"
@interface MRDPCursor : NSObject @interface MRDPCursor : NSObject

View File

@ -1,7 +1,5 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
#define boolean int
#import "freerdp/gdi/gdi.h" #import "freerdp/gdi/gdi.h"
#import "freerdp/rail/rail.h" #import "freerdp/rail/rail.h"
#import "MRDPRailWindow.h" #import "MRDPRailWindow.h"

View File

@ -746,7 +746,7 @@ extern struct kkey g_keys[];
//if ([self activateWindow]) //if ([self activateWindow])
mac_rail_send_activate(savedWindowId); mac_rail_send_activate(savedWindowId);
set_current_window(windowIndex); // set_current_window(windowIndex); // ? code mis-merge?
} }
- (void) releaseResources - (void) releaseResources

View File

@ -8,8 +8,6 @@
#import <Cocoa/Cocoa.h> #import <Cocoa/Cocoa.h>
typedef int boolean;
#import "MRDPWindow.h" #import "MRDPWindow.h"
#import "freerdp/freerdp.h" #import "freerdp/freerdp.h"
#import "freerdp/types.h" #import "freerdp/types.h"

View File

@ -1869,7 +1869,6 @@ void cliprdr_send_supported_format_list(freerdp *inst)
freerdp_channels_send_event(inst->context->channels, (RDP_EVENT*) event); freerdp_channels_send_event(inst->context->channels, (RDP_EVENT*) event);
} }
<<<<<<< HEAD
/**************************************************************************************** /****************************************************************************************
* * * *
* * * *

View File

@ -1,4 +1,7 @@
#!/bin/bash #!/bin/bash
# may now be legacy; 2 stage cmake no longer needed
# Xcode generated files directory # Xcode generated files directory
XCODE_PROJ_DIR=xcode XCODE_PROJ_DIR=xcode
# MacFreeRDP client directory # MacFreeRDP client directory