Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

iOS error: "Setup: loading style failed: no such file or directory" #852

Merged
merged 1 commit into from
Mar 4, 2015
Merged

iOS error: "Setup: loading style failed: no such file or directory" #852

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,13 @@ config/%.gypi: CMD = ./configure config/$*.gypi
config/%.gypi: configure
@$(ENV_$*) ./scripts/flock.py build/Configure.lock ./configure config/$*.gypi

styles/styles:
git submodule update --init styles

#### Library builds ############################################################

.PRECIOUS: Makefile/mbgl
Makefile/mbgl: config/$(HOST).gypi
Makefile/mbgl: config/$(HOST).gypi styles/styles
deps/run_gyp mbgl.gyp $(CONFIG_$(HOST)) $(LIBS_$(HOST)) --generator-output=./build/$(HOST) -f make

mbgl: Makefile/mbgl
Expand All @@ -37,13 +40,13 @@ install: Makefile/mbgl
LINK=`pwd`/gyp/link.py $(MAKE) -C build/$(HOST) BUILDTYPE=$(BUILDTYPE) install

.PRECIOUS: Xcode/mbgl
Xcode/mbgl: config/$(HOST).gypi
Xcode/mbgl: config/$(HOST).gypi styles/styles
deps/run_gyp mbgl.gyp $(CONFIG_$(HOST)) $(LIBS_$(HOST)) --generator-output=./build/$(HOST) -f xcode

##### Test builds ##############################################################

.PRECIOUS: Makefile/test
Makefile/test: test/test.gyp config/$(HOST).gypi
Makefile/test: test/test.gyp config/$(HOST).gypi styles/styles
deps/run_gyp test/test.gyp $(CONFIG_$(HOST)) $(LIBS_$(HOST)) --generator-output=./build/$(HOST) -f make

test: Makefile/test
Expand All @@ -54,7 +57,7 @@ test-%: test


.PRECIOUS: Xcode/test
Xcode/test: test/test.gyp config/osx.gypi
Xcode/test: test/test.gyp config/osx.gypi styles/styles
deps/run_gyp test/test.gyp $(CONFIG_osx) $(LIBS_osx) --generator-output=./build/osx -f xcode

.PHONY: lproj lbuild run-xlinux
Expand All @@ -71,7 +74,7 @@ xtest-%: xtest
#### Mac OS X application builds ###############################################

.PRECIOUS: Makefile/osx
Makefile/osx: macosx/mapboxgl-app.gyp config/osx.gypi
Makefile/osx: macosx/mapboxgl-app.gyp config/osx.gypi styles/styles
deps/run_gyp macosx/mapboxgl-app.gyp $(CONFIG_osx) $(LIBS_osx) --generator-output=./build/osx -f make

.PHONY: osx run-osx
Expand All @@ -83,7 +86,7 @@ run-osx: osx


.PRECIOUS: Xcode/osx
Xcode/osx: macosx/mapboxgl-app.gyp config/osx.gypi
Xcode/osx: macosx/mapboxgl-app.gyp config/osx.gypi styles/styles
deps/run_gyp macosx/mapboxgl-app.gyp $(CONFIG_osx) $(LIBS_osx) --generator-output=./build/osx -f xcode

.PHONY: xosx-proj xosx run-xosx
Expand All @@ -104,7 +107,7 @@ xproj: xosx-proj
#### iOS application builds ####################################################

.PRECIOUS: Xcode/ios
Xcode/ios: ios/app/mapboxgl-app.gyp config/ios.gypi
Xcode/ios: ios/app/mapboxgl-app.gyp config/ios.gypi styles/styles
deps/run_gyp ios/app/mapboxgl-app.gyp $(CONFIG_ios) $(LIBS_ios) --generator-output=./build/ios -f xcode

.PHONY: ios-proj ios run-ios
Expand All @@ -124,7 +127,7 @@ iproj: ios-proj
#### Linux application builds ##################################################

.PRECIOUS: Makefile/linux
Makefile/linux: linux/mapboxgl-app.gyp config/$(HOST).gypi
Makefile/linux: linux/mapboxgl-app.gyp config/$(HOST).gypi styles/styles
deps/run_gyp linux/mapboxgl-app.gyp $(CONFIG_$(HOST)) $(LIBS_linux) --generator-output=./build/$(HOST) -f make

.PHONY: linux run-linux
Expand All @@ -136,7 +139,7 @@ run-linux: linux


.PRECIOUS: Xcode/linux
Xcode/linux: linux/mapboxgl-app.gyp config/osx.gypi
Xcode/linux: linux/mapboxgl-app.gyp config/osx.gypi styles/styles
deps/run_gyp linux/mapboxgl-app.gyp $(CONFIG_osx) $(LIBS_linux) --generator-output=./build/osx -f xcode

.PHONY: lproj lbuild run-xlinux
Expand All @@ -157,7 +160,7 @@ lproj: xlinux-proj

.PRECIOUS: Makefile/android-%
Makefile/android-%: CMD = deps/run_gyp android/mapboxgl-app.gyp $(CONFIG_android-$*) $(LIBS_android) --generator-output=./build/android-$* -f make-android
Makefile/android-%: config/android-%.gypi
Makefile/android-%: config/android-%.gypi styles/styles
@echo $(CMD)
@$(ENV_android-$*) $(CMD)

Expand Down