diff options
25 files changed, 615 insertions, 83 deletions
@@ -17,6 +17,8 @@ default: #### OS X targets ############################################################## OSX_PROJ_PATH = build/osx-x86_64/platform/osx/platform.xcodeproj +OSX_WORK_PATH = platform/osx/osx.xcworkspace +OSX_DERIVED_DATA_PATH = build/DerivedData/osx osx: $(RUN) PLATFORM=osx Xcode/All @@ -25,7 +27,7 @@ $(OSX_PROJ_PATH): platform/osx/platform.gyp platform/osx/scripts/configure.sh mb $(RUN) PLATFORM=osx Xcode/__project__ xproj: $(OSX_PROJ_PATH) - open $(OSX_PROJ_PATH) + open $(OSX_WORK_PATH) $(OSX_PROJ_PATH)/xcshareddata/xcschemes/osxtest.xcscheme: platform/osx/scripts/osxtest.xcscheme mkdir -p $(basename $@) diff --git a/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon128x128.png b/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon128x128.png Binary files differnew file mode 100644 index 0000000000..145d5a7d85 --- /dev/null +++ b/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon128x128.png diff --git a/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon16x16.png b/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon16x16.png Binary files differnew file mode 100644 index 0000000000..fa2588dec3 --- /dev/null +++ b/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon16x16.png diff --git a/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256-1.png b/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256-1.png Binary files differnew file mode 100644 index 0000000000..18fec77f84 --- /dev/null +++ b/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256-1.png diff --git a/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256.png b/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256.png Binary files differnew file mode 100644 index 0000000000..18fec77f84 --- /dev/null +++ b/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon256x256.png diff --git a/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32-1.png b/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32-1.png Binary files differnew file mode 100644 index 0000000000..bf3acc1282 --- /dev/null +++ b/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32-1.png diff --git a/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32.png b/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32.png Binary files differnew file mode 100644 index 0000000000..bf3acc1282 --- /dev/null +++ b/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon32x32.png diff --git a/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512-1.png b/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512-1.png Binary files differnew file mode 100644 index 0000000000..1ea7683696 --- /dev/null +++ b/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512-1.png diff --git a/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512.png b/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512.png Binary files differnew file mode 100644 index 0000000000..1ea7683696 --- /dev/null +++ b/platform/osx/app/Assets.xcassets/AppIcon.appiconset/AppIcon512x512.png diff --git a/platform/osx/app/Assets.xcassets/AppIcon.appiconset/Contents.json b/platform/osx/app/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000000..58e739d056 --- /dev/null +++ b/platform/osx/app/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "AppIcon16x16.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "AppIcon32x32-1.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "AppIcon32x32.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "icon-1.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "AppIcon128x128.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "AppIcon256x256-1.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "AppIcon256x256.png", + "scale" : "1x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "AppIcon512x512-1.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "AppIcon512x512.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "icon.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +}
\ No newline at end of file diff --git a/platform/osx/app/Assets.xcassets/AppIcon.appiconset/icon-1.png b/platform/osx/app/Assets.xcassets/AppIcon.appiconset/icon-1.png Binary files differnew file mode 100644 index 0000000000..36dd7acf90 --- /dev/null +++ b/platform/osx/app/Assets.xcassets/AppIcon.appiconset/icon-1.png diff --git a/platform/osx/app/Assets.xcassets/AppIcon.appiconset/icon.png b/platform/osx/app/Assets.xcassets/AppIcon.appiconset/icon.png Binary files differnew file mode 100644 index 0000000000..fdee900aa4 --- /dev/null +++ b/platform/osx/app/Assets.xcassets/AppIcon.appiconset/icon.png diff --git a/platform/osx/app/Assets.xcassets/Contents.json b/platform/osx/app/Assets.xcassets/Contents.json new file mode 100644 index 0000000000..da4a164c91 --- /dev/null +++ b/platform/osx/app/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "version" : 1, + "author" : "xcode" + } +}
\ No newline at end of file diff --git a/platform/osx/app/MainMenu.xib b/platform/osx/app/Base.lproj/MainMenu.xib index 4f3633343b..4f3633343b 100644 --- a/platform/osx/app/MainMenu.xib +++ b/platform/osx/app/Base.lproj/MainMenu.xib diff --git a/platform/osx/app/MapDocument.xib b/platform/osx/app/Base.lproj/MapDocument.xib index 74743ca9e7..74743ca9e7 100644 --- a/platform/osx/app/MapDocument.xib +++ b/platform/osx/app/Base.lproj/MapDocument.xib diff --git a/platform/osx/app/DroppedPinAnnotation.h b/platform/osx/app/DroppedPinAnnotation.h index 69bb453f28..435a56738b 100644 --- a/platform/osx/app/DroppedPinAnnotation.h +++ b/platform/osx/app/DroppedPinAnnotation.h @@ -1,4 +1,4 @@ -#import "MGLPointAnnotation.h" +#import <Mapbox/Mapbox.h> @interface DroppedPinAnnotation : MGLPointAnnotation diff --git a/platform/osx/app/Icon.icns b/platform/osx/app/Icon.icns Binary files differdeleted file mode 100644 index 64a5e57cf8..0000000000 --- a/platform/osx/app/Icon.icns +++ /dev/null diff --git a/platform/osx/app/Info.plist b/platform/osx/app/Info.plist index 0ae973842b..cc7037f589 100644 --- a/platform/osx/app/Info.plist +++ b/platform/osx/app/Info.plist @@ -3,7 +3,7 @@ <plist version="1.0"> <dict> <key>CFBundleDevelopmentRegion</key> - <string>English</string> + <string>en</string> <key>CFBundleDocumentTypes</key> <array> <dict> @@ -21,16 +21,10 @@ </array> <key>CFBundleExecutable</key> <string>${EXECUTABLE_NAME}</string> - <key>CFBundleGetInfoString</key> - <string>0.1.0</string> - <key>CFBundleIconFile</key> - <string>Icon.icns</string> <key>CFBundleIdentifier</key> <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string> <key>CFBundleInfoDictionaryVersion</key> <string>6.0</string> - <key>CFBundleLongVersionString</key> - <string>0.1.0</string> <key>CFBundleName</key> <string>${PRODUCT_NAME}</string> <key>CFBundlePackageType</key> @@ -52,10 +46,8 @@ </array> <key>CFBundleVersion</key> <string>1</string> - <key>CSResourcesFileMapped</key> - <true/> - <key>NSHighResolutionCapable</key> - <true/> + <key>LSMinimumSystemVersion</key> + <string>$(MACOSX_DEPLOYMENT_TARGET)</string> <key>NSMainNibFile</key> <string>MainMenu</string> <key>NSPrincipalClass</key> diff --git a/platform/osx/osx.xcodeproj/project.pbxproj b/platform/osx/osx.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..da71ef8f0e --- /dev/null +++ b/platform/osx/osx.xcodeproj/project.pbxproj @@ -0,0 +1,373 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 46; + objects = { + +/* Begin PBXBuildFile section */ + DA839E971CC2E3400062CAFB /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = DA839E961CC2E3400062CAFB /* AppDelegate.m */; }; + DA839E9A1CC2E3400062CAFB /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = DA839E991CC2E3400062CAFB /* main.m */; }; + DA839E9D1CC2E3400062CAFB /* MapDocument.m in Sources */ = {isa = PBXBuildFile; fileRef = DA839E9C1CC2E3400062CAFB /* MapDocument.m */; }; + DA839EA01CC2E3400062CAFB /* MapDocument.xib in Resources */ = {isa = PBXBuildFile; fileRef = DA839E9E1CC2E3400062CAFB /* MapDocument.xib */; }; + DA839EA21CC2E3400062CAFB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = DA839EA11CC2E3400062CAFB /* Assets.xcassets */; }; + DA839EA51CC2E3400062CAFB /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = DA839EA31CC2E3400062CAFB /* MainMenu.xib */; }; + DAE6C2E21CC304F900DB3429 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = DAE6C2E11CC304F900DB3429 /* Credits.rtf */; }; + DAE6C2ED1CC3050F00DB3429 /* DroppedPinAnnotation.m in Sources */ = {isa = PBXBuildFile; fileRef = DAE6C2E41CC3050F00DB3429 /* DroppedPinAnnotation.m */; }; + DAE6C2EE1CC3050F00DB3429 /* LocationCoordinate2DTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = DAE6C2E61CC3050F00DB3429 /* LocationCoordinate2DTransformer.m */; }; + DAE6C2EF1CC3050F00DB3429 /* NSValue+Additions.m in Sources */ = {isa = PBXBuildFile; fileRef = DAE6C2E81CC3050F00DB3429 /* NSValue+Additions.m */; }; + DAE6C2F01CC3050F00DB3429 /* OfflinePackNameValueTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = DAE6C2EA1CC3050F00DB3429 /* OfflinePackNameValueTransformer.m */; }; + DAE6C2F11CC3050F00DB3429 /* TimeIntervalTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = DAE6C2EC1CC3050F00DB3429 /* TimeIntervalTransformer.m */; }; + DAE6C31F1CC30A2400DB3429 /* Mapbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DAE6C3181CC3083B00DB3429 /* Mapbox.framework */; }; + DAE6C3211CC30B3B00DB3429 /* Mapbox.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = DAE6C3181CC3083B00DB3429 /* Mapbox.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; +/* End PBXBuildFile section */ + +/* Begin PBXCopyFilesBuildPhase section */ + DAE6C3221CC30B3C00DB3429 /* Embed Frameworks */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + DAE6C3211CC30B3B00DB3429 /* Mapbox.framework in Embed Frameworks */, + ); + name = "Embed Frameworks"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + DA839E921CC2E3400062CAFB /* Mapbox GL.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Mapbox GL.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + DA839E951CC2E3400062CAFB /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = "<group>"; }; + DA839E961CC2E3400062CAFB /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = "<group>"; }; + DA839E991CC2E3400062CAFB /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; }; + DA839E9B1CC2E3400062CAFB /* MapDocument.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MapDocument.h; sourceTree = "<group>"; }; + DA839E9C1CC2E3400062CAFB /* MapDocument.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MapDocument.m; sourceTree = "<group>"; }; + DA839E9F1CC2E3400062CAFB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MapDocument.xib; sourceTree = "<group>"; }; + DA839EA11CC2E3400062CAFB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; }; + DA839EA41CC2E3400062CAFB /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; }; + DA839EA61CC2E3400062CAFB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; }; + DAE6C2E11CC304F900DB3429 /* Credits.rtf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = "<group>"; }; + DAE6C2E31CC3050F00DB3429 /* DroppedPinAnnotation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DroppedPinAnnotation.h; sourceTree = "<group>"; }; + DAE6C2E41CC3050F00DB3429 /* DroppedPinAnnotation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DroppedPinAnnotation.m; sourceTree = "<group>"; }; + DAE6C2E51CC3050F00DB3429 /* LocationCoordinate2DTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LocationCoordinate2DTransformer.h; sourceTree = "<group>"; }; + DAE6C2E61CC3050F00DB3429 /* LocationCoordinate2DTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LocationCoordinate2DTransformer.m; sourceTree = "<group>"; }; + DAE6C2E71CC3050F00DB3429 /* NSValue+Additions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSValue+Additions.h"; sourceTree = "<group>"; }; + DAE6C2E81CC3050F00DB3429 /* NSValue+Additions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSValue+Additions.m"; sourceTree = "<group>"; }; + DAE6C2E91CC3050F00DB3429 /* OfflinePackNameValueTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OfflinePackNameValueTransformer.h; sourceTree = "<group>"; }; + DAE6C2EA1CC3050F00DB3429 /* OfflinePackNameValueTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OfflinePackNameValueTransformer.m; sourceTree = "<group>"; }; + DAE6C2EB1CC3050F00DB3429 /* TimeIntervalTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimeIntervalTransformer.h; sourceTree = "<group>"; }; + DAE6C2EC1CC3050F00DB3429 /* TimeIntervalTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TimeIntervalTransformer.m; sourceTree = "<group>"; }; + DAE6C3181CC3083B00DB3429 /* Mapbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Mapbox.framework; sourceTree = BUILT_PRODUCTS_DIR; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + DA839E8F1CC2E3400062CAFB /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + DAE6C31F1CC30A2400DB3429 /* Mapbox.framework in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + DA839E891CC2E3400062CAFB = { + isa = PBXGroup; + children = ( + DA839E941CC2E3400062CAFB /* Demo App */, + DAE6C31E1CC308BC00DB3429 /* Frameworks */, + DA839E931CC2E3400062CAFB /* Products */, + ); + sourceTree = "<group>"; + }; + DA839E931CC2E3400062CAFB /* Products */ = { + isa = PBXGroup; + children = ( + DA839E921CC2E3400062CAFB /* Mapbox GL.app */, + ); + name = Products; + sourceTree = "<group>"; + }; + DA839E941CC2E3400062CAFB /* Demo App */ = { + isa = PBXGroup; + children = ( + DA839E951CC2E3400062CAFB /* AppDelegate.h */, + DA839E961CC2E3400062CAFB /* AppDelegate.m */, + DAE6C2E31CC3050F00DB3429 /* DroppedPinAnnotation.h */, + DAE6C2E41CC3050F00DB3429 /* DroppedPinAnnotation.m */, + DAE6C2E51CC3050F00DB3429 /* LocationCoordinate2DTransformer.h */, + DAE6C2E61CC3050F00DB3429 /* LocationCoordinate2DTransformer.m */, + DA839E9B1CC2E3400062CAFB /* MapDocument.h */, + DA839E9C1CC2E3400062CAFB /* MapDocument.m */, + DA839E9E1CC2E3400062CAFB /* MapDocument.xib */, + DAE6C2E71CC3050F00DB3429 /* NSValue+Additions.h */, + DAE6C2E81CC3050F00DB3429 /* NSValue+Additions.m */, + DAE6C2E91CC3050F00DB3429 /* OfflinePackNameValueTransformer.h */, + DAE6C2EA1CC3050F00DB3429 /* OfflinePackNameValueTransformer.m */, + DAE6C2EB1CC3050F00DB3429 /* TimeIntervalTransformer.h */, + DAE6C2EC1CC3050F00DB3429 /* TimeIntervalTransformer.m */, + DA839EA11CC2E3400062CAFB /* Assets.xcassets */, + DA839EA31CC2E3400062CAFB /* MainMenu.xib */, + DAE6C2E11CC304F900DB3429 /* Credits.rtf */, + DA839EA61CC2E3400062CAFB /* Info.plist */, + DA839E981CC2E3400062CAFB /* Supporting Files */, + ); + name = "Demo App"; + path = app; + sourceTree = "<group>"; + }; + DA839E981CC2E3400062CAFB /* Supporting Files */ = { + isa = PBXGroup; + children = ( + DA839E991CC2E3400062CAFB /* main.m */, + ); + name = "Supporting Files"; + sourceTree = "<group>"; + }; + DAE6C31E1CC308BC00DB3429 /* Frameworks */ = { + isa = PBXGroup; + children = ( + DAE6C3181CC3083B00DB3429 /* Mapbox.framework */, + ); + name = Frameworks; + sourceTree = "<group>"; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + DA839E911CC2E3400062CAFB /* osxapp */ = { + isa = PBXNativeTarget; + buildConfigurationList = DA839EA91CC2E3400062CAFB /* Build configuration list for PBXNativeTarget "osxapp" */; + buildPhases = ( + DA839E8E1CC2E3400062CAFB /* Sources */, + DA839E8F1CC2E3400062CAFB /* Frameworks */, + DA839E901CC2E3400062CAFB /* Resources */, + DAE6C3221CC30B3C00DB3429 /* Embed Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = osxapp; + productName = osxapp; + productReference = DA839E921CC2E3400062CAFB /* Mapbox GL.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + DA839E8A1CC2E3400062CAFB /* Project object */ = { + isa = PBXProject; + attributes = { + CLASSPREFIX = MBX; + LastUpgradeCheck = 0730; + ORGANIZATIONNAME = Mapbox; + TargetAttributes = { + DA839E911CC2E3400062CAFB = { + CreatedOnToolsVersion = 7.3; + }; + }; + }; + buildConfigurationList = DA839E8D1CC2E3400062CAFB /* Build configuration list for PBXProject "osx" */; + compatibilityVersion = "Xcode 3.2"; + developmentRegion = English; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = DA839E891CC2E3400062CAFB; + productRefGroup = DA839E931CC2E3400062CAFB /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + DA839E911CC2E3400062CAFB /* osxapp */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + DA839E901CC2E3400062CAFB /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + DA839EA21CC2E3400062CAFB /* Assets.xcassets in Resources */, + DA839EA01CC2E3400062CAFB /* MapDocument.xib in Resources */, + DA839EA51CC2E3400062CAFB /* MainMenu.xib in Resources */, + DAE6C2E21CC304F900DB3429 /* Credits.rtf in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + DA839E8E1CC2E3400062CAFB /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + DA839E9D1CC2E3400062CAFB /* MapDocument.m in Sources */, + DAE6C2ED1CC3050F00DB3429 /* DroppedPinAnnotation.m in Sources */, + DAE6C2EE1CC3050F00DB3429 /* LocationCoordinate2DTransformer.m in Sources */, + DAE6C2F11CC3050F00DB3429 /* TimeIntervalTransformer.m in Sources */, + DA839E9A1CC2E3400062CAFB /* main.m in Sources */, + DAE6C2EF1CC3050F00DB3429 /* NSValue+Additions.m in Sources */, + DA839E971CC2E3400062CAFB /* AppDelegate.m in Sources */, + DAE6C2F01CC3050F00DB3429 /* OfflinePackNameValueTransformer.m in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXVariantGroup section */ + DA839E9E1CC2E3400062CAFB /* MapDocument.xib */ = { + isa = PBXVariantGroup; + children = ( + DA839E9F1CC2E3400062CAFB /* Base */, + ); + name = MapDocument.xib; + sourceTree = "<group>"; + }; + DA839EA31CC2E3400062CAFB /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + DA839EA41CC2E3400062CAFB /* Base */, + ); + name = MainMenu.xib; + sourceTree = "<group>"; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + DA839EA71CC2E3400062CAFB /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.10; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + }; + name = Debug; + }; + DA839EA81CC2E3400062CAFB /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.10; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + }; + name = Release; + }; + DA839EAA1CC2E3400062CAFB /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = "$(SRCROOT)/app/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGL; + PRODUCT_NAME = "Mapbox GL"; + }; + name = Debug; + }; + DA839EAB1CC2E3400062CAFB /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = "$(SRCROOT)/app/Info.plist"; + LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks"; + PRODUCT_BUNDLE_IDENTIFIER = com.mapbox.MapboxGL; + PRODUCT_NAME = "Mapbox GL"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + DA839E8D1CC2E3400062CAFB /* Build configuration list for PBXProject "osx" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + DA839EA71CC2E3400062CAFB /* Debug */, + DA839EA81CC2E3400062CAFB /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + DA839EA91CC2E3400062CAFB /* Build configuration list for PBXNativeTarget "osxapp" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + DA839EAA1CC2E3400062CAFB /* Debug */, + DA839EAB1CC2E3400062CAFB /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = DA839E8A1CC2E3400062CAFB /* Project object */; +} diff --git a/platform/osx/osx.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/platform/osx/osx.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000000..6451d59cab --- /dev/null +++ b/platform/osx/osx.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Workspace + version = "1.0"> + <FileRef + location = "self:/Users/mxn/hub/mapbox-gl-native/platform/osx/osx.xcodeproj"> + </FileRef> +</Workspace> diff --git a/platform/osx/osx.xcodeproj/xcshareddata/xcschemes/osxapp.xcscheme b/platform/osx/osx.xcodeproj/xcshareddata/xcschemes/osxapp.xcscheme new file mode 100644 index 0000000000..528ce0e755 --- /dev/null +++ b/platform/osx/osx.xcodeproj/xcshareddata/xcschemes/osxapp.xcscheme @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Scheme + LastUpgradeVersion = "0730" + version = "1.3"> + <BuildAction + parallelizeBuildables = "YES" + buildImplicitDependencies = "YES"> + <BuildActionEntries> + <BuildActionEntry + buildForTesting = "YES" + buildForRunning = "YES" + buildForProfiling = "YES" + buildForArchiving = "YES" + buildForAnalyzing = "YES"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "DA839E911CC2E3400062CAFB" + BuildableName = "Mapbox GL.app" + BlueprintName = "osxapp" + ReferencedContainer = "container:osx.xcodeproj"> + </BuildableReference> + </BuildActionEntry> + </BuildActionEntries> + </BuildAction> + <TestAction + buildConfiguration = "Debug" + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + shouldUseLaunchSchemeArgsEnv = "YES"> + <Testables> + <TestableReference + skipped = "NO"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "DAE6C3301CC30DB200DB3429" + BuildableName = "test.xctest" + BlueprintName = "test" + ReferencedContainer = "container:osx.xcodeproj"> + </BuildableReference> + </TestableReference> + </Testables> + <MacroExpansion> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "DA839E911CC2E3400062CAFB" + BuildableName = "Mapbox GL.app" + BlueprintName = "osxapp" + ReferencedContainer = "container:osx.xcodeproj"> + </BuildableReference> + </MacroExpansion> + <AdditionalOptions> + </AdditionalOptions> + </TestAction> + <LaunchAction + buildConfiguration = "Debug" + selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" + selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" + launchStyle = "0" + useCustomWorkingDirectory = "NO" + ignoresPersistentStateOnLaunch = "NO" + debugDocumentVersioning = "YES" + debugServiceExtension = "internal" + allowLocationSimulation = "YES"> + <BuildableProductRunnable + runnableDebuggingMode = "0"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "DA839E911CC2E3400062CAFB" + BuildableName = "Mapbox GL.app" + BlueprintName = "osxapp" + ReferencedContainer = "container:osx.xcodeproj"> + </BuildableReference> + </BuildableProductRunnable> + <AdditionalOptions> + </AdditionalOptions> + </LaunchAction> + <ProfileAction + buildConfiguration = "Release" + shouldUseLaunchSchemeArgsEnv = "YES" + savedToolIdentifier = "" + useCustomWorkingDirectory = "NO" + debugDocumentVersioning = "YES"> + <BuildableProductRunnable + runnableDebuggingMode = "0"> + <BuildableReference + BuildableIdentifier = "primary" + BlueprintIdentifier = "DA839E911CC2E3400062CAFB" + BuildableName = "Mapbox GL.app" + BlueprintName = "osxapp" + ReferencedContainer = "container:osx.xcodeproj"> + </BuildableReference> + </BuildableProductRunnable> + </ProfileAction> + <AnalyzeAction + buildConfiguration = "Debug"> + </AnalyzeAction> + <ArchiveAction + buildConfiguration = "Release" + revealArchiveInOrganizer = "YES"> + </ArchiveAction> +</Scheme> diff --git a/platform/osx/osx.xcworkspace/contents.xcworkspacedata b/platform/osx/osx.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000000..f911e25e9f --- /dev/null +++ b/platform/osx/osx.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,10 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Workspace + version = "1.0"> + <FileRef + location = "container:osx.xcodeproj"> + </FileRef> + <FileRef + location = "group:../../build/osx-x86_64/platform/osx/platform.xcodeproj"> + </FileRef> +</Workspace> diff --git a/platform/osx/osx.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/platform/osx/osx.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 0000000000..09129db48c --- /dev/null +++ b/platform/osx/osx.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> +<plist version="1.0"> +<dict> + <key>BuildLocationStyle</key> + <string>UseAppPreferences</string> + <key>CustomBuildLocationType</key> + <string>RelativeToDerivedData</string> + <key>DerivedDataCustomLocation</key> + <string>../../build/DerivedData</string> + <key>DerivedDataLocationStyle</key> + <string>WorkspaceRelativePath</string> + <key>IssueFilterStyle</key> + <string>ShowActiveSchemeOnly</string> + <key>LiveSourceIssuesEnabled</key> + <true/> +</dict> +</plist> diff --git a/platform/osx/osx.xcworkspace/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist b/platform/osx/osx.xcworkspace/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist new file mode 100644 index 0000000000..cb6ecad738 --- /dev/null +++ b/platform/osx/osx.xcworkspace/xcshareddata/xcdebugger/Breakpoints_v2.xcbkptlist @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<Bucket + type = "3" + version = "2.0"> + <Breakpoints> + <BreakpointProxy + BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint"> + <BreakpointContent + shouldBeEnabled = "No" + ignoreCount = "0" + continueAfterRunningActions = "No" + scope = "1" + stopOnStyle = "0"> + <Actions> + <BreakpointActionProxy + ActionExtensionID = "Xcode.BreakpointAction.Sound"> + <ActionContent + soundName = "Basso"> + </ActionContent> + </BreakpointActionProxy> + </Actions> + </BreakpointContent> + </BreakpointProxy> + </Breakpoints> +</Bucket> diff --git a/platform/osx/platform.gyp b/platform/osx/platform.gyp index a8c6ce0704..612bf37789 100644 --- a/platform/osx/platform.gyp +++ b/platform/osx/platform.gyp @@ -266,75 +266,5 @@ }, }, }, - { - 'target_name': 'osxapp', - 'product_name': 'Mapbox GL', - 'type': 'executable', - 'product_extension': 'app', - 'mac_bundle': 1, - 'mac_bundle_resources': [ - 'app/Credits.rtf', - 'app/Icon.icns', - 'app/MainMenu.xib', - 'app/MapDocument.xib', - ], - - 'dependencies': [ - 'osxsdk', - ], - - 'sources': [ - 'app/AppDelegate.h', - 'app/AppDelegate.m', - 'app/DroppedPinAnnotation.h', - 'app/DroppedPinAnnotation.m', - 'app/LocationCoordinate2DTransformer.h', - 'app/LocationCoordinate2DTransformer.m', - 'app/MapDocument.h', - 'app/MapDocument.m', - 'app/OfflinePackNameValueTransformer.h', - 'app/OfflinePackNameValueTransformer.m', - 'app/TimeIntervalTransformer.h', - 'app/TimeIntervalTransformer.m', - 'app/NSValue+Additions.h', - 'app/NSValue+Additions.m', - 'app/main.m', - ], - - 'xcode_settings': { - 'CLANG_ENABLE_OBJC_ARC': 'YES', - 'INFOPLIST_FILE': 'app/Info.plist', - 'LD_RUNPATH_SEARCH_PATHS': [ - '\${inherited}', - '@executable_path/../Frameworks', - ], - 'PRODUCT_BUNDLE_IDENTIFIER': 'com.mapbox.MapboxGL', - 'SDKROOT': 'macosx', - 'SUPPORTED_PLATFORMS': 'macosx', - }, - - 'configurations': { - 'Debug': { - 'xcode_settings': { - 'COPY_PHASE_STRIP': 'NO', - }, - }, - 'Release': { - 'xcode_settings': { - 'COPY_PHASE_STRIP': 'YES', - }, - }, - }, - - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/${FRAMEWORKS_FOLDER_PATH}', - 'files': [ - '<(PRODUCT_DIR)/Mapbox.framework', - ], - 'xcode_code_sign': 1, - } - ], - }, ], } |
