summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-04-16 17:00:04 -0700
committerMinh Nguyễn <mxn@1ec5.org>2016-04-16 22:46:26 -0700
commit7054f808bc3f1b31b361217290540810e61cda8e (patch)
tree1c0f0abd81322024ec5848cb5c752b0935b529ff /Makefile
parentf83c7a8b81441099436dbe5c565e1f87bbd40f6f (diff)
downloadqtlocation-mapboxgl-7054f808bc3f1b31b361217290540810e61cda8e.tar.gz
[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.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
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 $@)