From 7054f808bc3f1b31b361217290540810e61cda8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Sat, 16 Apr 2016 17:00:04 -0700 Subject: [osx] Added Xcode project for osxapp osx.xcodeproj is an ordinary Xcode project with an ordinary Xcode target for osxapp, contained in an ordinary Xcode workspace that happens to also reference the gyp-generated platform.xcodeproj. The osxapp target links to and embeds Mapbox.framework, which is a product of the gyp-generated platform.xcodeproj. Moved XIBs into Base.lproj and icons into an asset catalog. Shared an Objective-C exception breakpoint, disabled by default. --- Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 67fd0af628..0cc46d87fc 100644 --- a/Makefile +++ b/Makefile @@ -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 $@) -- cgit v1.2.1