| OLD | NEW |
| 1 # Makefile that wraps the Gyp and build steps for Unix and Mac (but not Windows) | 1 # Makefile that wraps the Gyp and build steps for Unix and Mac (but not Windows) |
| 2 # Uses "make" to build on Unix, and "xcodebuild" to build on Mac. | 2 # Uses "make" to build on Unix, and "xcodebuild" to build on Mac. |
| 3 # | 3 # |
| 4 # Some usage examples (tested on both Linux and Mac): | 4 # Some usage examples (tested on both Linux and Mac): |
| 5 # | 5 # |
| 6 # # Clean everything | 6 # # Clean everything |
| 7 # make clean | 7 # make clean |
| 8 # | 8 # |
| 9 # # Build and run tests (in Debug mode) | 9 # # Build and run tests (in Debug mode) |
| 10 # make tests | 10 # make tests |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 # But that will be a bit complicated, so let's keep it for a future CL. | 36 # But that will be a bit complicated, so let's keep it for a future CL. |
| 37 # Tracked as https://code.google.com/p/skia/issues/detail?id=947 ('eliminate | 37 # Tracked as https://code.google.com/p/skia/issues/detail?id=947 ('eliminate |
| 38 # need for VALID_TARGETS in toplevel Makefile') | 38 # need for VALID_TARGETS in toplevel Makefile') |
| 39 VALID_TARGETS := \ | 39 VALID_TARGETS := \ |
| 40 bench \ | 40 bench \ |
| 41 debugger \ | 41 debugger \ |
| 42 everything \ | 42 everything \ |
| 43 gm \ | 43 gm \ |
| 44 most \ | 44 most \ |
| 45 pathops_unittest \ | 45 pathops_unittest \ |
| 46 pdfviewer \ |
| 46 SampleApp \ | 47 SampleApp \ |
| 47 SkiaAndroidApp \ | 48 SkiaAndroidApp \ |
| 48 skia_lib \ | 49 skia_lib \ |
| 49 tests \ | 50 tests \ |
| 50 tools | 51 tools |
| 51 | 52 |
| 52 # Default target. This must be listed before all other targets. | 53 # Default target. This must be listed before all other targets. |
| 53 .PHONY: default | 54 .PHONY: default |
| 54 default: most | 55 default: most |
| 55 | 56 |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 117 else ifneq (,$(findstring make, $(GYP_GENERATORS))) | 118 else ifneq (,$(findstring make, $(GYP_GENERATORS))) |
| 118 $(MAKE) -C $(SKIA_OUT) $@ BUILDTYPE=$(BUILDTYPE) | 119 $(MAKE) -C $(SKIA_OUT) $@ BUILDTYPE=$(BUILDTYPE) |
| 119 else ifneq (,$(findstring Darwin, $(uname))) | 120 else ifneq (,$(findstring Darwin, $(uname))) |
| 120 rm -f out/$(BUILDTYPE) || if test -d out/$(BUILDTYPE); then echo "run 'm
ake clean' or otherwise delete out/$(BUILDTYPE)"; exit 1; fi | 121 rm -f out/$(BUILDTYPE) || if test -d out/$(BUILDTYPE); then echo "run 'm
ake clean' or otherwise delete out/$(BUILDTYPE)"; exit 1; fi |
| 121 xcodebuild -project out/gyp/$@.xcodeproj -configuration $(BUILDTYPE) | 122 xcodebuild -project out/gyp/$@.xcodeproj -configuration $(BUILDTYPE) |
| 122 ln -s $(CWD)/xcodebuild/$(BUILDTYPE) out/$(BUILDTYPE) | 123 ln -s $(CWD)/xcodebuild/$(BUILDTYPE) out/$(BUILDTYPE) |
| 123 else | 124 else |
| 124 echo "unknown platform $(uname)" | 125 echo "unknown platform $(uname)" |
| 125 exit 1 | 126 exit 1 |
| 126 endif | 127 endif |
| OLD | NEW |