From Stephan Huber, "attached you’ll find a bunch of fixes + enhancements for iOS and OS X based on current trunk. I incorporated + tested the submission from Colin Cochran, so his submission is not needed anymore.
* fixed a bug with multi-touch and touch-id-generation on iOS and OS X. (will fix a bug reported by Colin Cochran, without ditching the existing logic)
* removed unnecessary warning-flagss when generating xcode-projects via cmake, will enable the usage of OSG_AGGRESSIVE_WARNING_FLAGS
* added support for 10.9 (OS X)
* new cmake-variable: IPHONE_VERSION_MIN, this will set the deployment-target (previously hard-coded) If you set the IPHONE_VERSION_MIN to something like 7.0 osg gets compiled also for 64bit (amd64)
* cmake defaults now to the clang compiler if IPHONE_VERSION_MIN > 4.2
* cmake now sets some xcode-settings so the compiler uses the c++98-standard (clang defaults to c++11, w/o this I got a lot of linking errors)
* removed include-dir for avfoundation-plugin as not needed on OSX/IOS.
* enhanced the ios-example, will now show multitouch-information on a hud (similar to the osgmultitouch-example), and more importantly, will compile + link out of the box
* small enhancements for the osc-device-plugin (send only one msg for MOVE/DRAG, even if multiple msgs/event is enabled)
* better memory-handling for the zeroconf-plugin
* fixed a possible bug in the rest-http-plugin when receiving mouse-events.
* incorporated a fix from Colin Cochran "forwarded touch events are not transformed into the GL UIView“
"
2013-10-07 18:05:09 +08:00
|
|
|
SET(TARGET_SRC
|
|
|
|
iphoneViewerAppDelegate.h
|
2010-11-27 02:19:28 +08:00
|
|
|
iphoneViewerAppDelegate.mm
|
|
|
|
main.m
|
|
|
|
osgPlugins.h
|
2017-03-18 14:53:32 +08:00
|
|
|
shaders.h
|
2010-11-27 02:19:28 +08:00
|
|
|
osgIPhoneViewer-Info.plist
|
|
|
|
)
|
|
|
|
|
2017-05-05 01:17:30 +08:00
|
|
|
SET(TARGET_ADDED_LIBRARIES osgdb_osg osgdb_rgb osgdb_imageio osgdb_avfoundation)
|
2010-12-02 22:20:52 +08:00
|
|
|
|
2017-05-04 07:24:46 +08:00
|
|
|
SET(TARGET_ADDED_LIBRARIES ${TARGET_ADDED_LIBRARIES}
|
|
|
|
osgdb_deprecated_osg osgdb_deprecated_osgparticle osgdb_deprecated_osganimation
|
|
|
|
osgdb_deprecated_osgfx osgdb_deprecated_osgsim osgdb_deprecated_osgtext
|
|
|
|
osgdb_deprecated_osgviewer osgdb_deprecated_osgshadow osgdb_deprecated_osgterrain
|
|
|
|
osgdb_deprecated_osgvolume
|
|
|
|
)
|
|
|
|
|
|
|
|
|
|
|
|
SET(TARGET_ADDED_LIBRARIES ${TARGET_ADDED_LIBRARIES}
|
|
|
|
osgdb_serializers_osg osgdb_serializers_osgparticle osgdb_serializers_osgtext
|
|
|
|
osgdb_serializers_osgterrain osgdb_serializers_osganimation osgdb_serializers_osgfx
|
|
|
|
osgdb_serializers_osgshadow osgdb_serializers_osgmanipulator osgdb_serializers_osgsim
|
|
|
|
osgdb_serializers_osgvolume
|
|
|
|
)
|
|
|
|
|
2010-11-30 17:26:18 +08:00
|
|
|
#backup setting
|
|
|
|
SET(TMP_OSG_BUILD_APPLICATION_BUNDLES {$OSG_BUILD_APPLICATION_BUNDLES})
|
|
|
|
SET(OSG_BUILD_APPLICATION_BUNDLES TRUE)
|
2018-07-10 09:09:28 +08:00
|
|
|
#SET(MACOSX_DEPLOYMENT_TARGET, ${IPHONE_VERSION_MIN})
|
2010-11-27 02:19:28 +08:00
|
|
|
SETUP_EXAMPLE(osgViewerIPhone)
|
2017-03-18 14:53:32 +08:00
|
|
|
SET_TARGET_PROPERTIES(example_osgViewerIPhone PROPERTIES XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY "iPhone Developer"
|
|
|
|
XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${IPHONE_VERSION_MIN}
|
|
|
|
XCODE_ATTRIBUTE_TARGETED_DEVICE_FAMILY "1,2")
|
From Stephan Huber, "attached you’ll find a bunch of fixes + enhancements for iOS and OS X based on current trunk. I incorporated + tested the submission from Colin Cochran, so his submission is not needed anymore.
* fixed a bug with multi-touch and touch-id-generation on iOS and OS X. (will fix a bug reported by Colin Cochran, without ditching the existing logic)
* removed unnecessary warning-flagss when generating xcode-projects via cmake, will enable the usage of OSG_AGGRESSIVE_WARNING_FLAGS
* added support for 10.9 (OS X)
* new cmake-variable: IPHONE_VERSION_MIN, this will set the deployment-target (previously hard-coded) If you set the IPHONE_VERSION_MIN to something like 7.0 osg gets compiled also for 64bit (amd64)
* cmake defaults now to the clang compiler if IPHONE_VERSION_MIN > 4.2
* cmake now sets some xcode-settings so the compiler uses the c++98-standard (clang defaults to c++11, w/o this I got a lot of linking errors)
* removed include-dir for avfoundation-plugin as not needed on OSX/IOS.
* enhanced the ios-example, will now show multitouch-information on a hud (similar to the osgmultitouch-example), and more importantly, will compile + link out of the box
* small enhancements for the osc-device-plugin (send only one msg for MOVE/DRAG, even if multiple msgs/event is enabled)
* better memory-handling for the zeroconf-plugin
* fixed a possible bug in the rest-http-plugin when receiving mouse-events.
* incorporated a fix from Colin Cochran "forwarded touch events are not transformed into the GL UIView“
"
2013-10-07 18:05:09 +08:00
|
|
|
|
2010-11-30 17:26:18 +08:00
|
|
|
#restore setting
|
|
|
|
SET(OSG_BUILD_APPLICATION_BUNDLES {$TMP_OSG_BUILD_APPLICATION_BUNDLES})
|
2018-07-10 09:09:28 +08:00
|
|
|
SET(CMAKE_EXE_LINKER_FLAGS "-framework QuartzCore -framework Foundation -framework UIKit -framework ImageIO -framework CoreImage -framework MobileCoreServices -framework CoreGraphics")
|