diff --git a/example/Project.xcconfig b/example/Project.xcconfig index c90f7b1..e570b15 100644 --- a/example/Project.xcconfig +++ b/example/Project.xcconfig @@ -13,5 +13,5 @@ ICON_FILE_PATH = $(OF_PATH)/libs/openFrameworksCompiled/project/osx/ //IF YOU WANT AN APP TO HAVE A CUSTOM ICON - PUT THEM IN YOUR DATA FOLDER AND CHANGE ICON_FILE_PATH to: //ICON_FILE_PATH = bin/data/ -OTHER_LDFLAGS = $(OF_CORE_LIBS) +OTHER_LDFLAGS = $(OF_CORE_LIBS) $(OF_CORE_FRAMEWORKS) HEADER_SEARCH_PATHS = $(OF_CORE_HEADERS) diff --git a/example/example.xcodeproj/project.pbxproj b/example/example.xcodeproj/project.pbxproj index 5a5c67e..c175e6b 100644 --- a/example/example.xcodeproj/project.pbxproj +++ b/example/example.xcodeproj/project.pbxproj @@ -80,7 +80,6 @@ 39C1248819F1EB75005DF557 /* SurfaceManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39C1248319F1EB75005DF557 /* SurfaceManager.cpp */; }; 39C1248919F1EB75005DF557 /* SurfaceManagerGui.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39C1248519F1EB75005DF557 /* SurfaceManagerGui.cpp */; }; 39C787BD1AC2111B00691393 /* CmdManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 39C787BC1AC2111B00691393 /* CmdManager.cpp */; }; - BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = BBAB23BE13894E4700AA2426 /* GLUT.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; E4328149138ABC9F0047C5CB /* openFrameworksDebug.a in Frameworks */ = {isa = PBXBuildFile; fileRef = E4328148138ABC890047C5CB /* openFrameworksDebug.a */; }; E45BE97B0E8CC7DD009D7055 /* AGL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9710E8CC7DD009D7055 /* AGL.framework */; }; E45BE97C0E8CC7DD009D7055 /* ApplicationServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E45BE9720E8CC7DD009D7055 /* ApplicationServices.framework */; }; @@ -125,7 +124,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - BBAB23CB13894F3D00AA2426 /* GLUT.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -900,7 +898,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "cp -f ../../../libs/fmodex/lib/osx/libfmodex.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/libfmodex.dylib\"; install_name_tool -change ./libfmodex.dylib @executable_path/libfmodex.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\";\nmkdir -p \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\"\ncp -f \"$ICON_FILE\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\"\n"; + shellScript = "rsync -aved ../../../libs/fmodex/lib/osx/libfmodex.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/\"; install_name_tool -change ./libfmodex.dylib @executable_path/libfmodex.dylib \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/MacOS/$PRODUCT_NAME\";\nmkdir -p \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\"\nrsync -aved \"$ICON_FILE\" \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Resources/\"\nrsync -aved ../../../libs/glut/lib/osx/GLUT.framework \"$TARGET_BUILD_DIR/$PRODUCT_NAME.app/Contents/Frameworks/\""; }; /* End PBXShellScriptBuildPhase section */ @@ -1002,6 +1000,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; CONFIGURATION_BUILD_DIR = "$(SRCROOT)/bin/"; COPY_PHASE_STRIP = NO; DEAD_CODE_STRIPPING = YES; @@ -1022,13 +1021,20 @@ "$(OF_CORE_HEADERS)", src, ); - MACOSX_DEPLOYMENT_TARGET = 10.6; + INFOPLIST_FILE = "openFrameworks-Info.plist"; + MACH_O_TYPE = mh_execute; + MACOSX_DEPLOYMENT_TARGET = 10.7; ONLY_ACTIVE_ARCH = YES; OTHER_CPLUSPLUSFLAGS = ( "-D__MACOSX_CORE__", "-lpthread", "-mtune=native", ); + OTHER_LDFLAGS = ( + "$(OF_CORE_LIBS)", + "$(OF_CORE_FRAMEWORKS)", + ); + PRIVATE_HEADERS_FOLDER_PATH = "$(PRODUCT_NAME:c99extidentifier)"; SDKROOT = macosx; }; name = Debug; @@ -1037,6 +1043,7 @@ isa = XCBuildConfiguration; baseConfigurationReference = E4EB6923138AFD0F00A09F29 /* Project.xcconfig */; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; CONFIGURATION_BUILD_DIR = "$(SRCROOT)/bin/"; COPY_PHASE_STRIP = YES; DEAD_CODE_STRIPPING = YES; @@ -1057,12 +1064,19 @@ "$(OF_CORE_HEADERS)", src, ); - MACOSX_DEPLOYMENT_TARGET = 10.6; + INFOPLIST_FILE = "openFrameworks-Info.plist"; + MACH_O_TYPE = mh_execute; + MACOSX_DEPLOYMENT_TARGET = 10.7; OTHER_CPLUSPLUSFLAGS = ( "-D__MACOSX_CORE__", "-lpthread", "-mtune=native", ); + OTHER_LDFLAGS = ( + "$(OF_CORE_LIBS)", + "$(OF_CORE_FRAMEWORKS)", + ); + PRIVATE_HEADERS_FOLDER_PATH = "$(PRODUCT_NAME:c99extidentifier)"; SDKROOT = macosx; }; name = Release; @@ -1153,7 +1167,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_51)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_52)", ); - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.8; OTHER_LDFLAGS = ( "$(OF_CORE_LIBS)", "$(OF_CORE_FRAMEWORKS)", @@ -1250,7 +1264,7 @@ "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_50)", "$(LIBRARY_SEARCH_PATHS_QUOTED_FOR_TARGET_51)", ); - MACOSX_DEPLOYMENT_TARGET = 10.11; + MACOSX_DEPLOYMENT_TARGET = 10.8; OTHER_LDFLAGS = ( "$(OF_CORE_LIBS)", "$(OF_CORE_FRAMEWORKS)", diff --git a/example/openFrameworks-Info.plist b/example/openFrameworks-Info.plist index 757f735..60abaf8 100644 --- a/example/openFrameworks-Info.plist +++ b/example/openFrameworks-Info.plist @@ -9,7 +9,7 @@ CFBundleIconFile ${ICON} CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) + cc.openFrameworks.ofapp CFBundleInfoDictionaryVersion 6.0 CFBundlePackageType