Static buid for Mac OS X, mf_interface, WITH_VERBOSE option

mf_interface is still in progress
gongfuPanada · Jun 11, 2013 · 42f7c7f · 42f7c7f
1 parent e9edd48
commit 42f7c7f
Show file tree

Hide file tree

Showing 13 changed files with 826 additions and 43 deletions.
diff --git a/.gitignore b/.gitignore
@@ -93,3 +93,5 @@ default.log
 
 *.cbp
 *.txt.user
+
+*.autosave
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -80,7 +80,7 @@ if(NOT CMAKE_BUILD_TYPE)
 endif()
 
 if(NOT DEFINED BUILD_SHARED_LIBS)
-	if(ANDROID OR IOS)
+	if(ANDROID OR IOS OR APPLE)
 		set(BUILD_SHARED_LIBS OFF)
 	else()
 		set(BUILD_SHARED_LIBS ON)
@@ -194,6 +194,7 @@ check_include_files(inttypes.h HAVE_INTTYPES_H)
 check_include_files(sys/modem.h HAVE_SYS_MODEM_H)
 check_include_files(sys/filio.h HAVE_SYS_FILIO_H)
 check_include_files(sys/strtio.h HAVE_SYS_STRTIO_H)
+check_include_files(sys/select.h HAVE_SYS_SELECT_H)
 else()
 set(HAVE_FCNTL_H 1)
 set(HAVE_UNISTD_H 1)
@@ -226,6 +227,14 @@ if(APPLE)
         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()
 
 # Android

diff --git a/buildx/client/Mac/cli/Info.plist b/buildx/client/Mac/cli/Info.plist
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>en</string>
+	<key>CFBundleExecutable</key>
+	<string></string>
+	<key>CFBundleIconFile</key>
+	<string>FreeRDP</string>
+	<key>CFBundleIdentifier</key>
+	<string>FreeRDP.Mac</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string></string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+	<key>LSMinimumSystemVersion</key>
+	<string></string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2012 __MyCompanyName__. All rights reserved.</string>
+	<key>NSMainNibFile</key>
+	<string>MainMenu</string>
+	<key>NSPrincipalClass</key>
+	<string>NSApplication</string>
+</dict>
+</plist>
diff --git a/client/Mac/CMakeLists.txt b/client/Mac/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 project(MacFreeRDP-library)
 
 # add directory for App
@@ -29,6 +28,14 @@ set(${MODULE_NAME}_RESOURCES "en.lproj/InfoPlist.strings")
 # OS X Interface Builder files
 file(GLOB ${MODULE_NAME}_XIBS *.xib)
 
+# source files
+file(GLOB ${MODULE_NAME}_SRC *.c *.m)
+
+# header files
+file(GLOB ${MODULE_NAME}_HEADERS *.h)
+
+message(WARNING "public headers:" ${${MODULE_NAME}_HEADERS})
+
 # Include XIB file in Xcode resources. 
 if("${CMAKE_GENERATOR}" MATCHES "Xcode")
 	message(STATUS "Adding Xcode XIB resources for ${MODULE_NAME}")
@@ -37,10 +44,7 @@ endif("${CMAKE_GENERATOR}" MATCHES "Xcode")
 
 add_library(${MODULE_NAME}
 	SHARED
-	MRDPView.h
-	MRDPView.m
-	MRDPCursor.m
-	PasswordDialog.m
+	${${MODULE_NAME}_SRC}
 	${${MODULE_NAME}_RESOURCES})
 
 # configures the framework to always be looked for in the application bundle in the Frameworks sub-folder.
@@ -63,7 +67,6 @@ set_target_properties(${MODULE_NAME} PROPERTIES
 	FRAMEWORK_VERSION 1.1.0
 	MACOSX_FRAMEWORK_SHORT_VERSION_STRING 1.1.0
 	MACOSX_FRAMEWORK_BUNDLE_VERSION 1.1.0
-	PUBLIC_HEADER "MRDPView.h"
 	INSTALL_NAME_DIR "@executable_path/../../Frameworks"
 	MACOSX_BUNDLE_INFO_PLIST ${CMAKE_CURRENT_BINARY_DIR}/Info.plist
 	BUILD_WITH_INSTALL_RPATH 1)  
@@ -95,37 +98,35 @@ endforeach()
 
 set_property(TARGET ${MODULE_NAME} PROPERTY FOLDER "Client/Mac")
 
-# Add a post-build event to copy the dependent libraries in the framework bundle 
-# Call install_name_tool to reassign the library install name
-foreach(LIB ${DEPENDENCIES})
-	# message("adding post-build dependency: ${LIB}")
-	add_custom_command(TARGET ${MODULE_NAME} POST_BUILD 
-  		COMMAND "${CMAKE_COMMAND}" -E copy 
-     			"$<TARGET_FILE:${LIB}>"
-     			"${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_NAME}.framework/Contents/$<TARGET_FILE_NAME:${LIB}>"
-  		COMMENT "Copying ${LIB} to output directory"
-  		COMMAND install_name_tool -change "$<TARGET_SONAME_FILE:${LIB}>" "@executable_path/../Frameworks/${MODULE_NAME}.framework/Contents/$<TARGET_FILE_NAME:${LIB}>" "${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_NAME}.framework/${MODULE_NAME}"
-  		COMMENT Setting install name for ${LIB}
-  		COMMAND "${CMAKE_COMMAND}" -E echo install_name_tool -change "$<TARGET_SONAME_FILE:${LIB}>" "@executable_path/../Frameworks/${MODULE_NAME}.framework/Contents/$<TARGET_FILE_NAME:${LIB}>" "${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_NAME}.framework/${MODULE_NAME}"
-  		)
-endforeach()
-
-
-# Call install_name_tool to reassign the library install names in dependent libraries
-foreach(DEST ${DEPENDENCIES})
-foreach(LIB ${DEPENDENCIES})
-	# message("adding post-build dependency: ${LIB}")
-	add_custom_command(TARGET ${MODULE_NAME} POST_BUILD
-  		COMMAND install_name_tool -change "$<TARGET_SONAME_FILE:${LIB}>" "@executable_path/../Frameworks/${MODULE_NAME}.framework/Contents/$<TARGET_FILE_NAME:${LIB}>" "${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_NAME}.framework/Contents/$<TARGET_FILE_NAME:${DEST}>"
-  		COMMENT Setting install name for ${LIB} in module ${DEST}
-)
+if (${BUILD_SHARED_LIBS})
+	# Add a post-build event to copy the dependent libraries in the framework bundle 
+	# Call install_name_tool to reassign the library install name
+	foreach(LIB ${DEPENDENCIES})
+		# message("adding post-build dependency: ${LIB}")
+		add_custom_command(TARGET ${MODULE_NAME} POST_BUILD 
+			COMMAND "${CMAKE_COMMAND}" -E copy 
+					"$<TARGET_FILE:${LIB}>"
+					"${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_NAME}.framework/Contents/$<TARGET_FILE_NAME:${LIB}>"
+			COMMENT "Copying ${LIB} to output directory"
+			COMMAND install_name_tool -change "$<TARGET_SONAME_FILE:${LIB}>" "@executable_path/../Frameworks/${MODULE_NAME}.framework/Contents/$<TARGET_FILE_NAME:${LIB}>" "${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_NAME}.framework/${MODULE_NAME}"
+			COMMENT Setting install name for ${LIB}
+			COMMAND "${CMAKE_COMMAND}" -E echo install_name_tool -change "$<TARGET_SONAME_FILE:${LIB}>" "@executable_path/../Frameworks/${MODULE_NAME}.framework/Contents/$<TARGET_FILE_NAME:${LIB}>" "${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_NAME}.framework/${MODULE_NAME}"
+			)
+	endforeach()
 
-#	 	COMMAND "${CMAKE_COMMAND}" -E echo install_name_tool -change "$<TARGET_SONAME_FILE:${LIB}>" #"@executable_path/../Frameworks/${MODULE_NAME}.framework/Contents/$<TARGET_FILE_NAME:${LIB}>" #"${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_NAME}.framework/Contents/$<TARGET_FILE_NAME:${DEST}>"
-#  		)
+	# Call install_name_tool to reassign the library install names in dependent libraries
+	foreach(DEST ${DEPENDENCIES})
+	foreach(LIB ${DEPENDENCIES})
+		# message("adding post-build dependency: ${LIB}")
+		add_custom_command(TARGET ${MODULE_NAME} POST_BUILD
+			COMMAND install_name_tool -change "$<TARGET_SONAME_FILE:${LIB}>" "@executable_path/../Frameworks/${MODULE_NAME}.framework/Contents/$<TARGET_FILE_NAME:${LIB}>" "${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_NAME}.framework/Contents/$<TARGET_FILE_NAME:${DEST}>"
+			COMMENT Setting install name for ${LIB} in module ${DEST}
+	)
 
-endforeach()
-endforeach()
+	endforeach()
+	endforeach()
 
+endif()
 
 # Add post-build NIB file generation in unix makefiles. XCode handles this implicitly.
 if("${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
@@ -153,4 +154,22 @@ if("${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
 			COMMENT "Compiling ${xib}")
 	endforeach()
 
+        # Copy the public header files into the framework
+        foreach(HEADER ${${MODULE_NAME}_HEADERS})
+                # message("adding post-build dependency: ${LIB}")
+                add_custom_command(TARGET ${MODULE_NAME} POST_BUILD
+                    COMMAND ditto ${HEADER} ${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_NAME}.framework/Headers/
+                    COMMENT Copying public header files to ${MODULE_NAME}
+        )
+
+        endforeach()
+
+        # Copy the FreeRDP header files into the framework
+        add_custom_command(TARGET ${MODULE_NAME} POST_BUILD
+                COMMAND ditto ${CMAKE_SOURCE_DIR}/include/freerdp ${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_NAME}.framework/Headers/freerdp
+                COMMENT Copying FreeRDP header files to ${MODULE_NAME}
+
+          )
+
+
 endif()
diff --git a/client/Mac/MRDPView.h b/client/Mac/MRDPView.h
@@ -19,6 +19,8 @@
 
 #import <Cocoa/Cocoa.h>
 
+
+
 #ifdef HAVE_RAIL
 #import "MRDPWindow.h"
 #endif
@@ -36,9 +38,9 @@
 #import "freerdp/rail/rail.h"
 #import "freerdp/rail.h"
 #import "freerdp/utils/rail.h"
-*/
-
 
+#import "mf_interface.h"
+*/
 
 @interface MRDPView : NSView
 {

diff --git a/client/Mac/cli/CMakeLists.txt b/client/Mac/cli/CMakeLists.txt
@@ -18,7 +18,7 @@ set(MACOSX_BUNDLE_LONG_VERSION_STRING "MacFreeRDP Client Version 1.1.0")
 set(MACOSX_BUNDLE_BUNDLE_NAME "MacFreeRDP")
 set(MACOSX_BUNDLE_SHORT_VERSION_STRING 1.1.0)
 set(MACOSX_BUNDLE_BUNDLE_VERSION 1.1.0)
-set(MACOSX_BUNDLE_COPYRIGHT "Copyright 2012. All Rights Reserved.")
+set(MACOSX_BUNDLE_COPYRIGHT "Copyright 2013. All Rights Reserved.")
 
 set(MACOSX_BUNDLE_NSMAIN_NIB_FILE "MainMenu")
 set(MACOSX_BUNDLE_NSPRINCIPAL_CLASS "NSApplication")
@@ -60,10 +60,10 @@ set_target_properties(${MODULE_NAME} PROPERTIES RESOURCE "${${MODULE_NAME}_RESOU
 # set_target_properties(${MODULE_NAME} PROPERTIES XCODE_ATTRIBUTE_CLANG_ENABLE_OBJC_ARC YES)
 
 # Support for automatic reference counting requires non-fragile abi.
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -v -fobjc-nonfragile-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} -v -F../")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -F../")
 
 # Tell XCode where to look for the MacFreeRDP-library framework
 set_target_properties(${MODULE_NAME} PROPERTIES XCODE_ATTRIBUTE_FRAMEWORK_SEARCH_PATHS
@@ -112,16 +112,16 @@ if("${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
 
 	# Make sure the 'Resources' Directory is correctly created before we build
 	add_custom_command (TARGET ${MODULE_NAME} PRE_BUILD
-						  COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_NAME}.app/Contents/Resources)
+						  COMMAND mkdir -p ${CMAKE_CURRENT_BINARY_DIR}/\${CONFIGURATION}/${MODULE_NAME}.app/Contents/Resources)
 
 	# Compile the .xib files using the 'ibtool' program with the destination being the app package
 	foreach(xib ${${MODULE_NAME}_XIBS})
 		get_filename_component(XIB_WE ${xib} NAME_WE)
 
 		add_custom_command (TARGET ${MODULE_NAME} POST_BUILD 
 			COMMAND ${IBTOOL} --errors --warnings --notices --output-format human-readable-text 
-				--compile ${CMAKE_CURRENT_BINARY_DIR}/$(CONFIGURATION)/${MODULE_NAME}.app/Contents/Resources/${XIB_WE}.nib ${xib}                     
+				--compile ${CMAKE_CURRENT_BINARY_DIR}/\${CONFIGURATION}/${MODULE_NAME}.app/Contents/Resources/${XIB_WE}.nib ${xib}
 			COMMENT "Compiling ${xib}")
 	endforeach()
 
-endif("${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
+endif("${CMAKE_GENERATOR}" MATCHES "Unix Makefiles")
diff --git a/client/Mac/mf_event.c b/client/Mac/mf_event.c
@@ -0,0 +1,32 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Implementation
+ * Event Handling
+ *
+ * Copyright 2009-2011 Jay Sorg
+ * Copyright 2010-2011 Vic Lee
+ * Copyright 2010-2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <stdio.h>
+
+#include <freerdp/freerdp.h>
+
+#include "mf_interface.h"
+#include "mf_event.h"
+
diff --git a/client/Mac/mf_event.h b/client/Mac/mf_event.h
@@ -0,0 +1,31 @@
+/**
+ * FreeRDP: A Remote Desktop Protocol Implementation
+ * Event Handling
+ *
+ * Copyright 2009-2011 Jay Sorg
+ * Copyright 2010-2011 Vic Lee
+ * Copyright 2010-2011 Marc-Andre Moreau <marcandre.moreau@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef __WF_EVENT_H
+#define __WF_EVENT_H
+
+#ifdef WITH_DEBUG_KBD
+#define DEBUG_KBD(fmt, ...) DEBUG_CLASS(KBD, fmt, ## __VA_ARGS__)
+#else
+#define DEBUG_KBD(fmt, ...) DEBUG_NULL(fmt, ## __VA_ARGS__)
+#endif
+
+#endif /* __WF_EVENT_H */
Original file line number	Diff line number	Diff line change
Expand Up		@@ -93,3 +93,5 @@ default.log

		*.cbp
		*.txt.user

		*.autosave