| 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 "ninja" to build the code. | 2 # Uses "ninja" to build the code. |
| 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 24 matching lines...) Expand all Loading... |
| 35 # to the gyp-generated Makefile for *any* target name. | 35 # to the gyp-generated Makefile for *any* target name. |
| 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 # | 39 # |
| 40 # TODO(epoger): I'm not sure if the above comment is still valid in a ninja | 40 # TODO(epoger): I'm not sure if the above comment is still valid in a ninja |
| 41 # world. | 41 # world. |
| 42 VALID_TARGETS := \ | 42 VALID_TARGETS := \ |
| 43 bench \ | 43 bench \ |
| 44 debugger \ | 44 debugger \ |
| 45 dm \ |
| 45 everything \ | 46 everything \ |
| 46 gm \ | 47 gm \ |
| 47 most \ | 48 most \ |
| 48 pathops_unittest \ | 49 pathops_unittest \ |
| 49 pdfviewer \ | 50 pdfviewer \ |
| 50 SampleApp \ | 51 SampleApp \ |
| 51 SampleApp_APK \ | 52 SampleApp_APK \ |
| 52 skhello \ | 53 skhello \ |
| 53 skia_lib \ | 54 skia_lib \ |
| 54 skpskgr_test \ | 55 skpskgr_test \ |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 87 # Run gyp no matter what. | 88 # Run gyp no matter what. |
| 88 .PHONY: gyp | 89 .PHONY: gyp |
| 89 gyp: | 90 gyp: |
| 90 $(CWD)/gyp_skia | 91 $(CWD)/gyp_skia |
| 91 | 92 |
| 92 # For all specific targets: run gyp if necessary, and then pass control to | 93 # For all specific targets: run gyp if necessary, and then pass control to |
| 93 # the gyp-generated buildfiles. | 94 # the gyp-generated buildfiles. |
| 94 .PHONY: $(VALID_TARGETS) | 95 .PHONY: $(VALID_TARGETS) |
| 95 $(VALID_TARGETS):: gyp | 96 $(VALID_TARGETS):: gyp |
| 96 ninja -C $(SKIA_OUT)/$(BUILDTYPE) $@ | 97 ninja -C $(SKIA_OUT)/$(BUILDTYPE) $@ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 257613004:
simplify tools/xsan_build now that make runs ninja (Closed)
Base URL: https://skia.googlesource.com/skia.git@master