iOS: removed deprecated cmake options, updated readme

druidsbane · Apr 2, 2013 · 5c0440e · 5c0440e
1 parent f5b4dd8
commit 5c0440e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 35 deletions.
diff --git a/cmake/ConfigOptionsiOS.cmake b/cmake/ConfigOptionsiOS.cmake
@@ -15,8 +15,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-option(IOS_BUILD_OBJC "Automatically build iOS objective-c code - build type depends on CMAKE_BUILD_TYPE" ON)
-option(IOS_BUILD_OBJC_DEBUG "Create an iOS debug package" ON)
 if (NOT FREERDP_IOS_EXTERNAL_SSL_PATH)
 	set(FREERDP_IOS_EXTERNAL_SSL_PATH "${CMAKE_CURRENT_SOURCE_DIR}/external/openssl")
 endif()

diff --git a/docs/README.ios b/docs/README.ios
@@ -2,15 +2,7 @@ Overview
 ========
 
 The FreeRDP iOS port allows users to enjoy FreeRDP features on Apple iOS devices.
-The application was written to be compatible with devices running iOS 3.2 or higher. 
-Please note that Apple dropped armv6 support in their latest Xcode releases.
-If you want to compile for armv6 devices you will have to use an older Xcode version and build the OpenSSL libraries for armv6 as well.
-
-For building the GUI part there are two possibilities:
-* integrated build - have cmake to operate Xcode and build everything
-* manual build - build FreeRDP libraries and invoke xcodebuild or Xcode manually for the frontend
-
-Manual builds should be used for development.
+The application was written to be compatible with devices running iOS 4.3 or higher. 
 
 
 Build requirements
@@ -20,7 +12,6 @@ The following prerequisites are required in order to build the iOS port:
 
 - cmake version >= 2.8.9
 - latest Xcode installed (>= 4.6)
-- installed "Command Line Tools" component
 - installed Provisioning Profile and iOS Developer Certificate for code signing
 - pre-build static OpenSSL libraries (see below)
 
@@ -43,35 +34,23 @@ If you build OpenSSL youself you need to set FREERDP_IOS_EXTERNAL_SSL_PATH when
 Building
 ========
 
-Integrated build
-----------------
-
 Run the following commands in the top level FreeRDP directory:
 
-cmake -DCMAKE_TOOLCHAIN_FILE=cmake/iOSToolchain.cmake
-make
-
-After that you should have a client/iOS/bin/<Debug or Release>/iFreeRDP.app application package.
+cmake -DCMAKE_TOOLCHAIN_FILE=cmake/iOSToolchain.cmake -GXcode
 
-Manual iOS builds
------------------
+This command will create a XCode project in the FreeRDP root folder called FreeRDP.xcodeproj.
+Open the project in XCode and modify, build or run the app. 
 
-First run cmake to prepare the build:
+Alternatively you can also build the project from the command line using xcodebuild:
 
-cmake -DCMAKE_TOOLCHAIN_FILE=cmake/iOSToolchain.cmake -DIOS_BUILD_OBJC=OFF
-make
-
-Now you can run your favourite xcodebuild command in client/iOS like this:
-
-cd client/iOS
-xcodebuild -project iFreeRDP.xcodeproj -configuration Debug -sdk iphoneos6.1 install
+xcodebuild -project FreeRDP.xcodeproj -configuration Debug -sdk iphoneos6.1
 
 Notes: 
 
 * XCode, by default will build the application into its derived data location (usually in ~/Library/Developer/...).
 If you want to specify an output directory add CONFIGURATION_BUILD_DIR=<output-path-here> to the end of above command line.
 
-* If using XCode choose "Open Other" from the welcome screen, browse to the client/iOS directory in your FreeRDP folder and select iFreeRDP.xcodeproj.
+* If using XCode choose "Open Other" from the welcome screen, browse to the FreeRDP root directory and select FreeRDP.xcodeproj.
 
 
 cmake variables
@@ -92,8 +71,3 @@ CMAKE_IOS_SDK_ROOT (used by toolchain file)
 FREERDP_IOS_EXTERNAL_SSL_PATH (used by FindOpenSSL)
 * absolut root path to the pre-built static OpenSSL libraries
 
-IOS_BUILD_OBJC (used by client/iOS/CMakeLists.txt)
-* can be ON/OFF (default ON) whether or not to build the objective-c UI with cmake
-
-IOS_BUILD_OBJC_DEBUG (used by client/iOS/CMakeLists.txt)
-* can be ON/OFF (default ON) whether or not to build a debug version of the objective-c UI