From 5eb9ab1d75a110aa335f99b2d073d6800c756c7e Mon Sep 17 00:00:00 2001
From: Thomas Hogarth <thomas.hogarth@gmail.com>
Date: Mon, 23 Jul 2018 23:52:16 +0100
Subject: [PATCH] removed ios simulator reference, adjusted readme

---
 CMakeModules/OsgMacroUtils.cmake |  4 ++--
 README.md                        | 17 +++++++++--------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/CMakeModules/OsgMacroUtils.cmake b/CMakeModules/OsgMacroUtils.cmake
index ab5d74882..dcc1fe37d 100644
--- a/CMakeModules/OsgMacroUtils.cmake
+++ b/CMakeModules/OsgMacroUtils.cmake
@@ -225,7 +225,7 @@ MACRO(SETUP_LIBRARY LIB_NAME)
         )
         SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES FOLDER "OSG Core")
         IF(APPLE)
-            IF(OSG_BUILD_PLATFORM_IPHONE OR OSG_BUILD_PLATFORM_IPHONE_SIMULATOR)
+            IF(OSG_BUILD_PLATFORM_IPHONE)
                 SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE ${IPHONE_ENABLE_BITCODE})
             ENDIF()
             SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES XCODE_ATTRIBUTE_WARNING_CFLAGS "")
@@ -336,7 +336,7 @@ MACRO(SETUP_PLUGIN PLUGIN_NAME)
     SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES FOLDER "Plugins")
     IF(APPLE)
         SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES XCODE_ATTRIBUTE_WARNING_CFLAGS "")
-        IF(OSG_BUILD_PLATFORM_IPHONE OR OSG_BUILD_PLATFORM_IPHONE_SIMULATOR)
+        IF(OSG_BUILD_PLATFORM_IPHONE)
             SET_TARGET_PROPERTIES(${TARGET_TARGETNAME} PROPERTIES XCODE_ATTRIBUTE_ENABLE_BITCODE ${IPHONE_ENABLE_BITCODE})
         ENDIF()
     ENDIF()
diff --git a/README.md b/README.md
index f4cbf6e25..69cade9e8 100644
--- a/README.md
+++ b/README.md
@@ -88,13 +88,14 @@ Many of the example programs use command-line arguments. When double-clicking on
 
 ## Section 3. Release notes on iOS build, by Thomas Hogarth
 
-With CMake, XCode and the iOS sdk installed you can generate an iOS XCode project using the following command line:
+With CMake 3.11, XCode 9.4 and the iOS sdk 11.4 installed you can generate an iOS XCode project using the following command line:
 
-    export THIRDPARTY_PATH=/path/to/my/3rdParty
+    export THIRDPARTY_PATH=/path/to/3rdParty
     cmake ./ -G Xcode -DOSG_BUILD_PLATFORM_IPHONE:BOOL=ON \
-    -DIPHONE_SDKVER="10.2" \
-    -DIPHONE_VERSION_MIN="8.0" \
-    -DOPENGL_PROFILE:STRING=GLES2 \
+    -DIPHONE_SDKVER="11.4" \
+    -DIPHONE_VERSION_MIN="10.0" \
+    -DOPENGL_PROFILE:STRING=GLES3 \
+    -DOSG_CPP_EXCEPTIONS_AVAILABLE:BOOL=ON \
     -DBUILD_OSG_APPLICATIONS:BOOL=OFF \
     -DBUILD_OSG_EXAMPLES:BOOL=ON \
     -DOSG_WINDOWING_SYSTEM:STRING=IOS \
@@ -105,15 +106,15 @@ With CMake, XCode and the iOS sdk installed you can generate an iOS XCode projec
     -DCURL_LIBRARY:PATH="$THIRDPARTY_PATH/curl-ios-device/lib/libcurl.a" \
     -DFREETYPE_INCLUDE_DIR_freetype2:PATH="$THIRDPARTY_PATH/freetype-ios-universal/include/freetype" \
     -DFREETYPE_INCLUDE_DIR_ft2build:PATH="$THIRDPARTY_PATH/freetype-ios-universal/include" \
-    -DFREETYPE_LIBRARY:PATH="$THIRDPARTY_PATH/freetype-ios-universal/lib/libFreeType_iphone_universal.a" \
+    -DFREETYPE_LIBRARY:PATH="$THIRDPARTY_PATH/freetype-ios-universal/lib/libFreetype2.a" \
     -DTIFF_INCLUDE_DIR:PATH="$THIRDPARTY_PATH/tiff-ios-device/include" \
     -DTIFF_LIBRARY:PATH="$THIRDPARTY_PATH/tiff-ios-device/lib/libtiff.a" \
     -DGDAL_INCLUDE_DIR:PATH="$THIRDPARTY_PATH/gdal-ios-device/include" \
     -DGDAL_LIBRARY:PATH="$THIRDPARTY_PATH/gdal-ios-device/lib/libgdal.a"
 
 
-Be sure to set the THIRDPARTY_PATH to the path containing your thirdparty dependencies. Set IPHONE_SDKVER to the version of the iOS sdk you have installed, in this instance 10.2. IPHONE_VERSION_MIN controls the base sdk used by xcode, and lastly set OPENGL_PROFILE to the version of GLES you want to use.
+Be sure to set the THIRDPARTY_PATH to the path containing your thirdparty dependencies. Set IPHONE_SDKVER to the version of the iOS sdk you have installed, in this instance 11.4. IPHONE_VERSION_MIN controls the deployment sdk used by xcode, and lastly set OPENGL_PROFILE to the version of GLES you want to use.
 
-Once this completes an XCode project will have been generated in the osg root folder. Open the generated Xcode project, select the example_osgViewerIPhone target. In 'General' tab set a development team. In the 'Build Settings' tab search for 'Other Linker Flags', then for each target type (debug, release etc) that you want to use open the list of arguments and delete the 'OpenGL' line and the '-framework' line above it. This is because cmake has tried to add the desktop OpenGL library which we don't want.
+Once this completes an XCode project will have been generated in the osg root folder. Open the generated Xcode project, select the example_osgViewerIPhone target. In 'General' tab set a development team.
 
 Once this is done you should be able to build and deploy the `example_osgViewerIPhone` target on your device.