diff --git a/samples/GestureApp/xcode/GestureApp.xcodeproj/project.pbxproj b/samples/GestureApp/xcode/GestureApp.xcodeproj/project.pbxproj index ea6151e..289d2a3 100644 --- a/samples/GestureApp/xcode/GestureApp.xcodeproj/project.pbxproj +++ b/samples/GestureApp/xcode/GestureApp.xcodeproj/project.pbxproj @@ -12,6 +12,10 @@ 00B784B40FF439BC000DE1D7 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B784B00FF439BC000DE1D7 /* AudioToolbox.framework */; }; 00B784B50FF439BC000DE1D7 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B784B10FF439BC000DE1D7 /* AudioUnit.framework */; }; 00B784B60FF439BC000DE1D7 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B784B20FF439BC000DE1D7 /* CoreAudio.framework */; }; + 20036A651B83BC62009F5FC1 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A641B83BC62009F5FC1 /* AVFoundation.framework */; }; + 20036A671B83BC66009F5FC1 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A661B83BC66009F5FC1 /* IOKit.framework */; }; + 20036A691B83BC6B009F5FC1 /* IOSurface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A681B83BC6B009F5FC1 /* IOSurface.framework */; }; + 20036A6B1B83BC82009F5FC1 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A6A1B83BC82009F5FC1 /* CoreMedia.framework */; }; 5323E6B20EAFCA74003A9687 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5323E6B10EAFCA74003A9687 /* CoreVideo.framework */; }; 5323E6B60EAFCA7E003A9687 /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5323E6B50EAFCA7E003A9687 /* QTKit.framework */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; @@ -43,12 +47,16 @@ 00B784B10FF439BC000DE1D7 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; }; 00B784B20FF439BC000DE1D7 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; + 20036A641B83BC62009F5FC1 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; + 20036A661B83BC66009F5FC1 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; + 20036A681B83BC6B009F5FC1 /* IOSurface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOSurface.framework; path = System/Library/Frameworks/IOSurface.framework; sourceTree = SDKROOT; }; + 20036A6A1B83BC82009F5FC1 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; 334F79182B9947F2A1A4632B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 5323E6B10EAFCA74003A9687 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = /System/Library/Frameworks/CoreVideo.framework; sourceTree = ""; }; 5323E6B50EAFCA7E003A9687 /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = /System/Library/Frameworks/QTKit.framework; sourceTree = ""; }; - 8D1107320486CEB800E47090 /* MotionApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = MotionApp.app; path = GestureApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 8D1107320486CEB800E47090 /* GestureApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = GestureApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; AE1BA86C1667F13800E8CDFD /* GestureApp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = GestureApp.cpp; path = ../src/GestureApp.cpp; sourceTree = ""; }; AE1BA8711667F14D00E8CDFD /* Leap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Leap.h; path = ../../../src/Leap.h; sourceTree = ""; }; AE1BA8731667F1BD00E8CDFD /* CinderApp.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = CinderApp.icns; sourceTree = ""; }; @@ -65,6 +73,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 20036A6B1B83BC82009F5FC1 /* CoreMedia.framework in Frameworks */, + 20036A691B83BC6B009F5FC1 /* IOSurface.framework in Frameworks */, + 20036A671B83BC66009F5FC1 /* IOKit.framework in Frameworks */, + 20036A651B83BC62009F5FC1 /* AVFoundation.framework in Frameworks */, AED9A7E116F0FF2C00FB96DB /* QuickTime.framework in Frameworks */, AE362B65166801950094CD37 /* libLeap.dylib in Frameworks */, 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, @@ -100,6 +112,10 @@ 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( + 20036A6A1B83BC82009F5FC1 /* CoreMedia.framework */, + 20036A681B83BC6B009F5FC1 /* IOSurface.framework */, + 20036A661B83BC66009F5FC1 /* IOKit.framework */, + 20036A641B83BC62009F5FC1 /* AVFoundation.framework */, 00B784AF0FF439BC000DE1D7 /* Accelerate.framework */, 00B784B00FF439BC000DE1D7 /* AudioToolbox.framework */, 00B784B10FF439BC000DE1D7 /* AudioUnit.framework */, @@ -126,7 +142,7 @@ 19C28FACFE9D520D11CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 8D1107320486CEB800E47090 /* MotionApp.app */, + 8D1107320486CEB800E47090 /* GestureApp.app */, ); name = Products; sourceTree = ""; @@ -200,7 +216,7 @@ name = GestureApp; productInstallPath = "$(HOME)/Applications"; productName = TuioMultitouchBasic; - productReference = 8D1107320486CEB800E47090 /* MotionApp.app */; + productReference = 8D1107320486CEB800E47090 /* GestureApp.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -257,7 +273,6 @@ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; @@ -266,19 +281,13 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = GestureApp_Prefix.pch; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LD_RUNPATH_SEARCH_PATHS = "@loader_path"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/../../../lib/macosx\"", - ); MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_LDFLAGS = "\"$(CINDER_PATH)/lib/libcinder_d.a\""; PRODUCT_NAME = GestureApp; SYMROOT = ./build; - VALID_ARCHS = "i386 x86_64"; WRAPPER_EXTENSION = app; }; name = Debug; @@ -286,7 +295,6 @@ C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -297,20 +305,14 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = GestureApp_Prefix.pch; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LD_RUNPATH_SEARCH_PATHS = "@loader_path"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/../../../lib/macosx\"", - ); MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_LDFLAGS = "\"$(CINDER_PATH)/lib/libcinder.a\""; PRODUCT_NAME = GestureApp; STRIP_INSTALLED_PRODUCT = YES; SYMROOT = ./build; - VALID_ARCHS = "i386 x86_64"; WRAPPER_EXTENSION = app; }; name = Release; @@ -319,13 +321,13 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CINDER_PATH = ../../../../../; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; + HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)include\""; LD_DYLIB_INSTALL_NAME = ""; LIBRARY_SEARCH_PATHS = ../../../lib/macosx; MACOSX_DEPLOYMENT_TARGET = 10.7; @@ -339,13 +341,13 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CINDER_PATH = ../../../../../; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; + HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)include\""; LD_DYLIB_INSTALL_NAME = ""; LIBRARY_SEARCH_PATHS = ../../../lib/macosx; MACOSX_DEPLOYMENT_TARGET = 10.7; diff --git a/samples/ImageApp/xcode/ImageApp.xcodeproj/project.pbxproj b/samples/ImageApp/xcode/ImageApp.xcodeproj/project.pbxproj index 44aa68d..7d5df98 100644 --- a/samples/ImageApp/xcode/ImageApp.xcodeproj/project.pbxproj +++ b/samples/ImageApp/xcode/ImageApp.xcodeproj/project.pbxproj @@ -12,6 +12,10 @@ 00B784B40FF439BC000DE1D7 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B784B00FF439BC000DE1D7 /* AudioToolbox.framework */; }; 00B784B50FF439BC000DE1D7 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B784B10FF439BC000DE1D7 /* AudioUnit.framework */; }; 00B784B60FF439BC000DE1D7 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B784B20FF439BC000DE1D7 /* CoreAudio.framework */; }; + 20036A8D1B83C38D009F5FC1 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A8C1B83C38D009F5FC1 /* IOKit.framework */; }; + 20036A8F1B83C391009F5FC1 /* IOSurface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A8E1B83C391009F5FC1 /* IOSurface.framework */; }; + 20036A911B83C396009F5FC1 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A901B83C396009F5FC1 /* CoreMedia.framework */; }; + 20036A931B83C39C009F5FC1 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A921B83C39C009F5FC1 /* AVFoundation.framework */; }; 5323E6B20EAFCA74003A9687 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5323E6B10EAFCA74003A9687 /* CoreVideo.framework */; }; 5323E6B60EAFCA7E003A9687 /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5323E6B50EAFCA7E003A9687 /* QTKit.framework */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; @@ -43,6 +47,10 @@ 00B784B10FF439BC000DE1D7 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; }; 00B784B20FF439BC000DE1D7 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; + 20036A8C1B83C38D009F5FC1 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; + 20036A8E1B83C391009F5FC1 /* IOSurface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOSurface.framework; path = System/Library/Frameworks/IOSurface.framework; sourceTree = SDKROOT; }; + 20036A901B83C396009F5FC1 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; + 20036A921B83C39C009F5FC1 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; 334F79182B9947F2A1A4632B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -65,6 +73,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 20036A931B83C39C009F5FC1 /* AVFoundation.framework in Frameworks */, + 20036A911B83C396009F5FC1 /* CoreMedia.framework in Frameworks */, + 20036A8F1B83C391009F5FC1 /* IOSurface.framework in Frameworks */, + 20036A8D1B83C38D009F5FC1 /* IOKit.framework in Frameworks */, AE6540B816F39CB300F522E2 /* QuickTime.framework in Frameworks */, AE362B65166801950094CD37 /* libLeap.dylib in Frameworks */, 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, @@ -100,6 +112,10 @@ 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( + 20036A921B83C39C009F5FC1 /* AVFoundation.framework */, + 20036A901B83C396009F5FC1 /* CoreMedia.framework */, + 20036A8E1B83C391009F5FC1 /* IOSurface.framework */, + 20036A8C1B83C38D009F5FC1 /* IOKit.framework */, AE6540B716F39CB300F522E2 /* QuickTime.framework */, 00B784AF0FF439BC000DE1D7 /* Accelerate.framework */, 00B784B00FF439BC000DE1D7 /* AudioToolbox.framework */, @@ -257,7 +273,6 @@ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; @@ -266,19 +281,13 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ImageApp_Prefix.pch; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LD_RUNPATH_SEARCH_PATHS = "@loader_path"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/../../../lib/macosx\"", - ); MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_LDFLAGS = "\"$(CINDER_PATH)/lib/libcinder_d.a\""; PRODUCT_NAME = ImageApp; SYMROOT = ./build; - VALID_ARCHS = "i386 x86_64"; WRAPPER_EXTENSION = app; }; name = Debug; @@ -286,7 +295,6 @@ C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -297,20 +305,14 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ImageApp_Prefix.pch; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LD_RUNPATH_SEARCH_PATHS = "@loader_path"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/../../../lib/macosx\"", - ); MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_LDFLAGS = "\"$(CINDER_PATH)/lib/libcinder.a\""; PRODUCT_NAME = ImageApp; STRIP_INSTALLED_PRODUCT = YES; SYMROOT = ./build; - VALID_ARCHS = "i386 x86_64"; WRAPPER_EXTENSION = app; }; name = Release; @@ -319,13 +321,13 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CINDER_PATH = ../../../../../; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; + HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)include\""; LD_DYLIB_INSTALL_NAME = ""; LIBRARY_SEARCH_PATHS = ../../../lib/macosx; MACOSX_DEPLOYMENT_TARGET = 10.7; @@ -339,13 +341,13 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CINDER_PATH = ../../../../../; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; + HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)include\""; LD_DYLIB_INSTALL_NAME = ""; LIBRARY_SEARCH_PATHS = ../../../lib/macosx; MACOSX_DEPLOYMENT_TARGET = 10.7; diff --git a/samples/LeapApp/xcode/LeapApp.xcodeproj/project.pbxproj b/samples/LeapApp/xcode/LeapApp.xcodeproj/project.pbxproj index cd2003a..27438be 100644 --- a/samples/LeapApp/xcode/LeapApp.xcodeproj/project.pbxproj +++ b/samples/LeapApp/xcode/LeapApp.xcodeproj/project.pbxproj @@ -12,6 +12,10 @@ 00B784B40FF439BC000DE1D7 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B784B00FF439BC000DE1D7 /* AudioToolbox.framework */; }; 00B784B50FF439BC000DE1D7 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B784B10FF439BC000DE1D7 /* AudioUnit.framework */; }; 00B784B60FF439BC000DE1D7 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B784B20FF439BC000DE1D7 /* CoreAudio.framework */; }; + 20036A5D1B83BBBF009F5FC1 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A5C1B83BBBF009F5FC1 /* IOKit.framework */; }; + 20036A5F1B83BBC4009F5FC1 /* IOSurface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A5E1B83BBC4009F5FC1 /* IOSurface.framework */; }; + 20036A611B83BBCD009F5FC1 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A601B83BBCD009F5FC1 /* AVFoundation.framework */; }; + 20036A631B83BBE5009F5FC1 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A621B83BBE5009F5FC1 /* CoreMedia.framework */; }; 5323E6B20EAFCA74003A9687 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5323E6B10EAFCA74003A9687 /* CoreVideo.framework */; }; 5323E6B60EAFCA7E003A9687 /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5323E6B50EAFCA7E003A9687 /* QTKit.framework */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; @@ -43,6 +47,10 @@ 00B784B10FF439BC000DE1D7 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; }; 00B784B20FF439BC000DE1D7 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; + 20036A5C1B83BBBF009F5FC1 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; + 20036A5E1B83BBC4009F5FC1 /* IOSurface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOSurface.framework; path = System/Library/Frameworks/IOSurface.framework; sourceTree = SDKROOT; }; + 20036A601B83BBCD009F5FC1 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; + 20036A621B83BBE5009F5FC1 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; 334F79182B9947F2A1A4632B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -65,8 +73,12 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - AE6540B816F39CB300F522E2 /* QuickTime.framework in Frameworks */, + 20036A631B83BBE5009F5FC1 /* CoreMedia.framework in Frameworks */, + 20036A611B83BBCD009F5FC1 /* AVFoundation.framework in Frameworks */, + 20036A5F1B83BBC4009F5FC1 /* IOSurface.framework in Frameworks */, + 20036A5D1B83BBBF009F5FC1 /* IOKit.framework in Frameworks */, AE362B65166801950094CD37 /* libLeap.dylib in Frameworks */, + AE6540B816F39CB300F522E2 /* QuickTime.framework in Frameworks */, 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, 0091D8F90E81B9330029341E /* OpenGL.framework in Frameworks */, 5323E6B20EAFCA74003A9687 /* CoreVideo.framework in Frameworks */, @@ -100,6 +112,10 @@ 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( + 20036A621B83BBE5009F5FC1 /* CoreMedia.framework */, + 20036A601B83BBCD009F5FC1 /* AVFoundation.framework */, + 20036A5E1B83BBC4009F5FC1 /* IOSurface.framework */, + 20036A5C1B83BBBF009F5FC1 /* IOKit.framework */, AE6540B716F39CB300F522E2 /* QuickTime.framework */, 00B784AF0FF439BC000DE1D7 /* Accelerate.framework */, 00B784B00FF439BC000DE1D7 /* AudioToolbox.framework */, @@ -257,7 +273,6 @@ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; @@ -266,19 +281,13 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = LeapApp_Prefix.pch; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LD_RUNPATH_SEARCH_PATHS = "@loader_path"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/../../../lib/macosx\"", - ); MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_LDFLAGS = "\"$(CINDER_PATH)/lib/libcinder_d.a\""; PRODUCT_NAME = LeapApp; SYMROOT = ./build; - VALID_ARCHS = "i386 x86_64"; WRAPPER_EXTENSION = app; }; name = Debug; @@ -286,7 +295,6 @@ C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -297,20 +305,14 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = LeapApp_Prefix.pch; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LD_RUNPATH_SEARCH_PATHS = "@loader_path"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/../../../lib/macosx\"", - ); MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_LDFLAGS = "\"$(CINDER_PATH)/lib/libcinder.a\""; PRODUCT_NAME = LeapApp; STRIP_INSTALLED_PRODUCT = YES; SYMROOT = ./build; - VALID_ARCHS = "i386 x86_64"; WRAPPER_EXTENSION = app; }; name = Release; @@ -319,13 +321,13 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CINDER_PATH = ../../../../../; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; + HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)include\""; LD_DYLIB_INSTALL_NAME = ""; LIBRARY_SEARCH_PATHS = ../../../lib/macosx; MACOSX_DEPLOYMENT_TARGET = 10.7; @@ -339,13 +341,13 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CINDER_PATH = ../../../../../; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; + HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)include\""; LD_DYLIB_INSTALL_NAME = ""; LIBRARY_SEARCH_PATHS = ../../../lib/macosx; MACOSX_DEPLOYMENT_TARGET = 10.7; diff --git a/samples/MotionApp/xcode/MotionApp.xcodeproj/project.pbxproj b/samples/MotionApp/xcode/MotionApp.xcodeproj/project.pbxproj index 301f56c..28d45d7 100644 --- a/samples/MotionApp/xcode/MotionApp.xcodeproj/project.pbxproj +++ b/samples/MotionApp/xcode/MotionApp.xcodeproj/project.pbxproj @@ -12,6 +12,10 @@ 00B784B40FF439BC000DE1D7 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B784B00FF439BC000DE1D7 /* AudioToolbox.framework */; }; 00B784B50FF439BC000DE1D7 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B784B10FF439BC000DE1D7 /* AudioUnit.framework */; }; 00B784B60FF439BC000DE1D7 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B784B20FF439BC000DE1D7 /* CoreAudio.framework */; }; + 20036A851B83C03F009F5FC1 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A841B83C03F009F5FC1 /* CoreMedia.framework */; }; + 20036A871B83C044009F5FC1 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A861B83C044009F5FC1 /* IOKit.framework */; }; + 20036A891B83C049009F5FC1 /* IOSurface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A881B83C049009F5FC1 /* IOSurface.framework */; }; + 20036A8B1B83C04F009F5FC1 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A8A1B83C04F009F5FC1 /* AVFoundation.framework */; }; 5323E6B20EAFCA74003A9687 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5323E6B10EAFCA74003A9687 /* CoreVideo.framework */; }; 5323E6B60EAFCA7E003A9687 /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5323E6B50EAFCA7E003A9687 /* QTKit.framework */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; @@ -43,6 +47,10 @@ 00B784B10FF439BC000DE1D7 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; }; 00B784B20FF439BC000DE1D7 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; + 20036A841B83C03F009F5FC1 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; + 20036A861B83C044009F5FC1 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; + 20036A881B83C049009F5FC1 /* IOSurface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOSurface.framework; path = System/Library/Frameworks/IOSurface.framework; sourceTree = SDKROOT; }; + 20036A8A1B83C04F009F5FC1 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; 334F79182B9947F2A1A4632B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -65,6 +73,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 20036A8B1B83C04F009F5FC1 /* AVFoundation.framework in Frameworks */, + 20036A891B83C049009F5FC1 /* IOSurface.framework in Frameworks */, + 20036A871B83C044009F5FC1 /* IOKit.framework in Frameworks */, + 20036A851B83C03F009F5FC1 /* CoreMedia.framework in Frameworks */, AED9A7E116F0FF2C00FB96DB /* QuickTime.framework in Frameworks */, AE362B65166801950094CD37 /* libLeap.dylib in Frameworks */, 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, @@ -100,6 +112,10 @@ 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( + 20036A8A1B83C04F009F5FC1 /* AVFoundation.framework */, + 20036A881B83C049009F5FC1 /* IOSurface.framework */, + 20036A861B83C044009F5FC1 /* IOKit.framework */, + 20036A841B83C03F009F5FC1 /* CoreMedia.framework */, 00B784AF0FF439BC000DE1D7 /* Accelerate.framework */, 00B784B00FF439BC000DE1D7 /* AudioToolbox.framework */, 00B784B10FF439BC000DE1D7 /* AudioUnit.framework */, @@ -257,7 +273,6 @@ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; @@ -266,19 +281,13 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = MotionApp_Prefix.pch; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LD_RUNPATH_SEARCH_PATHS = "@loader_path"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/../../../lib/macosx\"", - ); MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_LDFLAGS = "\"$(CINDER_PATH)/lib/libcinder_d.a\""; PRODUCT_NAME = MotionApp; SYMROOT = ./build; - VALID_ARCHS = "i386 x86_64"; WRAPPER_EXTENSION = app; }; name = Debug; @@ -286,7 +295,6 @@ C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -297,20 +305,14 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = MotionApp_Prefix.pch; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LD_RUNPATH_SEARCH_PATHS = "@loader_path"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/../../../lib/macosx\"", - ); MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_LDFLAGS = "\"$(CINDER_PATH)/lib/libcinder.a\""; PRODUCT_NAME = MotionApp; STRIP_INSTALLED_PRODUCT = YES; SYMROOT = ./build; - VALID_ARCHS = "i386 x86_64"; WRAPPER_EXTENSION = app; }; name = Release; @@ -319,13 +321,13 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CINDER_PATH = ../../../../../; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; + HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)include\""; LD_DYLIB_INSTALL_NAME = ""; LIBRARY_SEARCH_PATHS = ../../../lib/macosx; MACOSX_DEPLOYMENT_TARGET = 10.7; @@ -339,13 +341,13 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CINDER_PATH = ../../../../../; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; + HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)include\""; LD_DYLIB_INSTALL_NAME = ""; LIBRARY_SEARCH_PATHS = ../../../lib/macosx; MACOSX_DEPLOYMENT_TARGET = 10.7; diff --git a/samples/SkeletalApp/xcode/SkeletalApp.xcodeproj/project.pbxproj b/samples/SkeletalApp/xcode/SkeletalApp.xcodeproj/project.pbxproj index 018b6af..8912526 100644 --- a/samples/SkeletalApp/xcode/SkeletalApp.xcodeproj/project.pbxproj +++ b/samples/SkeletalApp/xcode/SkeletalApp.xcodeproj/project.pbxproj @@ -12,6 +12,10 @@ 00B784B40FF439BC000DE1D7 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B784B00FF439BC000DE1D7 /* AudioToolbox.framework */; }; 00B784B50FF439BC000DE1D7 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B784B10FF439BC000DE1D7 /* AudioUnit.framework */; }; 00B784B60FF439BC000DE1D7 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B784B20FF439BC000DE1D7 /* CoreAudio.framework */; }; + 20036A7D1B83BF56009F5FC1 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A7C1B83BF56009F5FC1 /* CoreMedia.framework */; }; + 20036A7F1B83BF5A009F5FC1 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A7E1B83BF5A009F5FC1 /* AVFoundation.framework */; }; + 20036A811B83BF67009F5FC1 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A801B83BF67009F5FC1 /* IOKit.framework */; }; + 20036A831B83BF6C009F5FC1 /* IOSurface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A821B83BF6C009F5FC1 /* IOSurface.framework */; }; 5323E6B20EAFCA74003A9687 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5323E6B10EAFCA74003A9687 /* CoreVideo.framework */; }; 5323E6B60EAFCA7E003A9687 /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5323E6B50EAFCA7E003A9687 /* QTKit.framework */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; @@ -43,6 +47,10 @@ 00B784B10FF439BC000DE1D7 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; }; 00B784B20FF439BC000DE1D7 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; + 20036A7C1B83BF56009F5FC1 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; + 20036A7E1B83BF5A009F5FC1 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; + 20036A801B83BF67009F5FC1 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; + 20036A821B83BF6C009F5FC1 /* IOSurface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOSurface.framework; path = System/Library/Frameworks/IOSurface.framework; sourceTree = SDKROOT; }; 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; 334F79182B9947F2A1A4632B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -65,6 +73,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 20036A831B83BF6C009F5FC1 /* IOSurface.framework in Frameworks */, + 20036A811B83BF67009F5FC1 /* IOKit.framework in Frameworks */, + 20036A7F1B83BF5A009F5FC1 /* AVFoundation.framework in Frameworks */, + 20036A7D1B83BF56009F5FC1 /* CoreMedia.framework in Frameworks */, AE6540B816F39CB300F522E2 /* QuickTime.framework in Frameworks */, AE362B65166801950094CD37 /* libLeap.dylib in Frameworks */, 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, @@ -100,6 +112,10 @@ 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( + 20036A821B83BF6C009F5FC1 /* IOSurface.framework */, + 20036A801B83BF67009F5FC1 /* IOKit.framework */, + 20036A7E1B83BF5A009F5FC1 /* AVFoundation.framework */, + 20036A7C1B83BF56009F5FC1 /* CoreMedia.framework */, AE6540B716F39CB300F522E2 /* QuickTime.framework */, 00B784AF0FF439BC000DE1D7 /* Accelerate.framework */, 00B784B00FF439BC000DE1D7 /* AudioToolbox.framework */, @@ -257,7 +273,6 @@ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; @@ -266,19 +281,13 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = SkeletalApp_Prefix.pch; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LD_RUNPATH_SEARCH_PATHS = "@loader_path"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/../../../lib/macosx\"", - ); MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_LDFLAGS = "\"$(CINDER_PATH)/lib/libcinder_d.a\""; PRODUCT_NAME = SkeletalApp; SYMROOT = ./build; - VALID_ARCHS = "i386 x86_64"; WRAPPER_EXTENSION = app; }; name = Debug; @@ -286,7 +295,6 @@ C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -297,20 +305,14 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = SkeletalApp_Prefix.pch; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LD_RUNPATH_SEARCH_PATHS = "@loader_path"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/../../../lib/macosx\"", - ); MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_LDFLAGS = "\"$(CINDER_PATH)/lib/libcinder.a\""; PRODUCT_NAME = SkeletalApp; STRIP_INSTALLED_PRODUCT = YES; SYMROOT = ./build; - VALID_ARCHS = "i386 x86_64"; WRAPPER_EXTENSION = app; }; name = Release; @@ -319,13 +321,13 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CINDER_PATH = ../../../../../; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; + HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)include\""; LD_DYLIB_INSTALL_NAME = ""; LIBRARY_SEARCH_PATHS = ../../../lib/macosx; MACOSX_DEPLOYMENT_TARGET = 10.7; @@ -339,13 +341,13 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CINDER_PATH = ../../../../../; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; + HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)include\""; LD_DYLIB_INSTALL_NAME = ""; LIBRARY_SEARCH_PATHS = ../../../lib/macosx; MACOSX_DEPLOYMENT_TARGET = 10.7; diff --git a/samples/TracerApp/src/TracerApp.cpp b/samples/TracerApp/src/TracerApp.cpp index 3f171bf..d46dfd2 100644 --- a/samples/TracerApp/src/TracerApp.cpp +++ b/samples/TracerApp/src/TracerApp.cpp @@ -218,7 +218,7 @@ void TracerApp::update() if ( finger.isExtended() ) { int32_t id = finger.id(); if ( mRibbons.find( id ) == mRibbons.end() ) { - vec3 v = randVec3f(); + vec3 v = randVec3(); v.x = math::abs( v.x ); v.y = math::abs( v.y ); v.z = math::abs( v.z ); diff --git a/samples/TracerApp/xcode/TracerApp.xcodeproj/project.pbxproj b/samples/TracerApp/xcode/TracerApp.xcodeproj/project.pbxproj index 5122d26..4098693 100644 --- a/samples/TracerApp/xcode/TracerApp.xcodeproj/project.pbxproj +++ b/samples/TracerApp/xcode/TracerApp.xcodeproj/project.pbxproj @@ -12,6 +12,10 @@ 00B784B40FF439BC000DE1D7 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B784B00FF439BC000DE1D7 /* AudioToolbox.framework */; }; 00B784B50FF439BC000DE1D7 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B784B10FF439BC000DE1D7 /* AudioUnit.framework */; }; 00B784B60FF439BC000DE1D7 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B784B20FF439BC000DE1D7 /* CoreAudio.framework */; }; + 20036A751B83BEC6009F5FC1 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A741B83BEC5009F5FC1 /* AVFoundation.framework */; }; + 20036A771B83BECA009F5FC1 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A761B83BECA009F5FC1 /* CoreMedia.framework */; }; + 20036A791B83BECE009F5FC1 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A781B83BECE009F5FC1 /* IOKit.framework */; }; + 20036A7B1B83BED2009F5FC1 /* IOSurface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A7A1B83BED2009F5FC1 /* IOSurface.framework */; }; 5323E6B20EAFCA74003A9687 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5323E6B10EAFCA74003A9687 /* CoreVideo.framework */; }; 5323E6B60EAFCA7E003A9687 /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5323E6B50EAFCA7E003A9687 /* QTKit.framework */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; @@ -47,12 +51,16 @@ 00B784B10FF439BC000DE1D7 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; }; 00B784B20FF439BC000DE1D7 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; + 20036A741B83BEC5009F5FC1 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; + 20036A761B83BECA009F5FC1 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; + 20036A781B83BECE009F5FC1 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; + 20036A7A1B83BED2009F5FC1 /* IOSurface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOSurface.framework; path = System/Library/Frameworks/IOSurface.framework; sourceTree = SDKROOT; }; 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; 334F79182B9947F2A1A4632B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 5323E6B10EAFCA74003A9687 /* CoreVideo.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreVideo.framework; path = /System/Library/Frameworks/CoreVideo.framework; sourceTree = ""; }; 5323E6B50EAFCA7E003A9687 /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = /System/Library/Frameworks/QTKit.framework; sourceTree = ""; }; - 8D1107320486CEB800E47090 /* LeapApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; name = LeapApp.app; path = TracerApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 8D1107320486CEB800E47090 /* TracerApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TracerApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; AE15E03D16F39CE700238DC0 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = System/Library/Frameworks/QuickTime.framework; sourceTree = SDKROOT; }; AE1BA8711667F14D00E8CDFD /* Leap.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Leap.h; path = ../../../src/Leap.h; sourceTree = ""; }; AE1BA8731667F1BD00E8CDFD /* CinderApp.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = CinderApp.icns; sourceTree = ""; }; @@ -75,6 +83,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 20036A7B1B83BED2009F5FC1 /* IOSurface.framework in Frameworks */, + 20036A791B83BECE009F5FC1 /* IOKit.framework in Frameworks */, + 20036A771B83BECA009F5FC1 /* CoreMedia.framework in Frameworks */, + 20036A751B83BEC6009F5FC1 /* AVFoundation.framework in Frameworks */, AE15E03E16F39CE700238DC0 /* QuickTime.framework in Frameworks */, AE362B65166801950094CD37 /* libLeap.dylib in Frameworks */, 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, @@ -137,7 +149,7 @@ 19C28FACFE9D520D11CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 8D1107320486CEB800E47090 /* LeapApp.app */, + 8D1107320486CEB800E47090 /* TracerApp.app */, ); name = Products; sourceTree = ""; @@ -180,6 +192,10 @@ 29B97323FDCFA39411CA2CEA /* Frameworks */ = { isa = PBXGroup; children = ( + 20036A7A1B83BED2009F5FC1 /* IOSurface.framework */, + 20036A781B83BECE009F5FC1 /* IOKit.framework */, + 20036A761B83BECA009F5FC1 /* CoreMedia.framework */, + 20036A741B83BEC5009F5FC1 /* AVFoundation.framework */, 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */, 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */, ); @@ -216,7 +232,7 @@ name = TracerApp; productInstallPath = "$(HOME)/Applications"; productName = TuioMultitouchBasic; - productReference = 8D1107320486CEB800E47090 /* LeapApp.app */; + productReference = 8D1107320486CEB800E47090 /* TracerApp.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -277,7 +293,6 @@ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; @@ -286,19 +301,13 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = TracerApp_Prefix.pch; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LD_RUNPATH_SEARCH_PATHS = "@loader_path"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/../../../lib/macosx\"", - ); MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_LDFLAGS = "\"$(CINDER_PATH)/lib/libcinder_d.a\""; PRODUCT_NAME = TracerApp; SYMROOT = ./build; - VALID_ARCHS = "i386 x86_64"; WRAPPER_EXTENSION = app; }; name = Debug; @@ -306,7 +315,6 @@ C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -317,20 +325,14 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = TracerApp_Prefix.pch; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LD_RUNPATH_SEARCH_PATHS = "@loader_path"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/../../../lib/macosx\"", - ); MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_LDFLAGS = "\"$(CINDER_PATH)/lib/libcinder.a\""; PRODUCT_NAME = TracerApp; STRIP_INSTALLED_PRODUCT = YES; SYMROOT = ./build; - VALID_ARCHS = "i386 x86_64"; WRAPPER_EXTENSION = app; }; name = Release; @@ -339,13 +341,13 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CINDER_PATH = ../../../../../; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; + HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)include\""; LD_DYLIB_INSTALL_NAME = ""; LIBRARY_SEARCH_PATHS = ../../../lib/macosx; MACOSX_DEPLOYMENT_TARGET = 10.7; @@ -359,13 +361,13 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CINDER_PATH = ../../../../../; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; + HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)include\""; LD_DYLIB_INSTALL_NAME = ""; LIBRARY_SEARCH_PATHS = ../../../lib/macosx; MACOSX_DEPLOYMENT_TARGET = 10.7; diff --git a/samples/UiApp/xcode/UiApp.xcodeproj/project.pbxproj b/samples/UiApp/xcode/UiApp.xcodeproj/project.pbxproj index 70f4ff8..6def4dd 100644 --- a/samples/UiApp/xcode/UiApp.xcodeproj/project.pbxproj +++ b/samples/UiApp/xcode/UiApp.xcodeproj/project.pbxproj @@ -12,6 +12,10 @@ 00B784B40FF439BC000DE1D7 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B784B00FF439BC000DE1D7 /* AudioToolbox.framework */; }; 00B784B50FF439BC000DE1D7 /* AudioUnit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B784B10FF439BC000DE1D7 /* AudioUnit.framework */; }; 00B784B60FF439BC000DE1D7 /* CoreAudio.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 00B784B20FF439BC000DE1D7 /* CoreAudio.framework */; }; + 20036A6D1B83BE17009F5FC1 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A6C1B83BE17009F5FC1 /* AVFoundation.framework */; }; + 20036A6F1B83BE1D009F5FC1 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A6E1B83BE1D009F5FC1 /* CoreMedia.framework */; }; + 20036A711B83BE22009F5FC1 /* IOKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A701B83BE22009F5FC1 /* IOKit.framework */; }; + 20036A731B83BE27009F5FC1 /* IOSurface.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 20036A721B83BE27009F5FC1 /* IOSurface.framework */; }; 5323E6B20EAFCA74003A9687 /* CoreVideo.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5323E6B10EAFCA74003A9687 /* CoreVideo.framework */; }; 5323E6B60EAFCA7E003A9687 /* QTKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5323E6B50EAFCA7E003A9687 /* QTKit.framework */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; @@ -50,6 +54,10 @@ 00B784B10FF439BC000DE1D7 /* AudioUnit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioUnit.framework; path = System/Library/Frameworks/AudioUnit.framework; sourceTree = SDKROOT; }; 00B784B20FF439BC000DE1D7 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; }; 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; }; + 20036A6C1B83BE17009F5FC1 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; }; + 20036A6E1B83BE1D009F5FC1 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; }; + 20036A701B83BE22009F5FC1 /* IOKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOKit.framework; path = System/Library/Frameworks/IOKit.framework; sourceTree = SDKROOT; }; + 20036A721B83BE27009F5FC1 /* IOSurface.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = IOSurface.framework; path = System/Library/Frameworks/IOSurface.framework; sourceTree = SDKROOT; }; 29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; 29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; }; 334F79182B9947F2A1A4632B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -80,6 +88,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 20036A731B83BE27009F5FC1 /* IOSurface.framework in Frameworks */, + 20036A711B83BE22009F5FC1 /* IOKit.framework in Frameworks */, + 20036A6F1B83BE1D009F5FC1 /* CoreMedia.framework in Frameworks */, + 20036A6D1B83BE17009F5FC1 /* AVFoundation.framework in Frameworks */, AE15E04016F39D3D00238DC0 /* QuickTime.framework in Frameworks */, AE362B65166801950094CD37 /* libLeap.dylib in Frameworks */, 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, @@ -115,6 +127,10 @@ 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = { isa = PBXGroup; children = ( + 20036A721B83BE27009F5FC1 /* IOSurface.framework */, + 20036A701B83BE22009F5FC1 /* IOKit.framework */, + 20036A6E1B83BE1D009F5FC1 /* CoreMedia.framework */, + 20036A6C1B83BE17009F5FC1 /* AVFoundation.framework */, AE15E03F16F39D3D00238DC0 /* QuickTime.framework */, 00B784AF0FF439BC000DE1D7 /* Accelerate.framework */, 00B784B00FF439BC000DE1D7 /* AudioToolbox.framework */, @@ -287,7 +303,6 @@ C01FCF4B08A954540054247B /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; @@ -296,19 +311,13 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = UiApp_Prefix.pch; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LD_RUNPATH_SEARCH_PATHS = "@loader_path"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/../../../lib/macosx\"", - ); MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_LDFLAGS = "\"$(CINDER_PATH)/lib/libcinder_d.a\""; PRODUCT_NAME = UiApp; SYMROOT = ./build; - VALID_ARCHS = "i386 x86_64"; WRAPPER_EXTENSION = app; }; name = Debug; @@ -316,7 +325,6 @@ C01FCF4C08A954540054247B /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; COMBINE_HIDPI_IMAGES = YES; DEAD_CODE_STRIPPING = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; @@ -327,20 +335,14 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = UiApp_Prefix.pch; GCC_SYMBOLS_PRIVATE_EXTERN = NO; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; INFOPLIST_FILE = Info.plist; INSTALL_PATH = "$(HOME)/Applications"; LD_RUNPATH_SEARCH_PATHS = "@loader_path"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "\"$(SRCROOT)/../../../lib/macosx\"", - ); MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_LDFLAGS = "\"$(CINDER_PATH)/lib/libcinder.a\""; PRODUCT_NAME = UiApp; STRIP_INSTALLED_PRODUCT = YES; SYMROOT = ./build; - VALID_ARCHS = "i386 x86_64"; WRAPPER_EXTENSION = app; }; name = Release; @@ -349,13 +351,13 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CINDER_PATH = ../../../../../; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; + HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)include\""; LD_DYLIB_INSTALL_NAME = ""; LIBRARY_SEARCH_PATHS = ../../../lib/macosx; MACOSX_DEPLOYMENT_TARGET = 10.7; @@ -369,13 +371,13 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; + ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CINDER_PATH = ../../../../../; CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)boost\""; + HEADER_SEARCH_PATHS = "\"$(CINDER_PATH)include\""; LD_DYLIB_INSTALL_NAME = ""; LIBRARY_SEARCH_PATHS = ../../../lib/macosx; MACOSX_DEPLOYMENT_TARGET = 10.7;