| 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 dm | 10 # make dm |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 # Soon we should be able to get rid of VALID_TARGETS, and just pass control | 34 # Soon we should be able to get rid of VALID_TARGETS, and just pass control |
| 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 nanobench \ | 43 nanobench \ |
| 44 visualbench \ | |
| 45 debugger \ | 44 debugger \ |
| 46 dm \ | 45 dm \ |
| 47 everything \ | 46 everything \ |
| 48 lua_app \ | 47 lua_app \ |
| 49 lua_pictures \ | 48 lua_pictures \ |
| 50 most \ | 49 most \ |
| 51 pathops_unittest \ | 50 pathops_unittest \ |
| 52 SampleApp \ | 51 SampleApp \ |
| 53 SampleApp_APK \ | 52 SampleApp_APK \ |
| 54 skhello \ | 53 skhello \ |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 88 # Run gyp no matter what. | 87 # Run gyp no matter what. |
| 89 .PHONY: gyp | 88 .PHONY: gyp |
| 90 gyp: | 89 gyp: |
| 91 $(CWD)/gyp_skia --no-parallel -G config=$(BUILDTYPE) | 90 $(CWD)/gyp_skia --no-parallel -G config=$(BUILDTYPE) |
| 92 | 91 |
| 93 # For all specific targets: run gyp if necessary, and then pass control to | 92 # For all specific targets: run gyp if necessary, and then pass control to |
| 94 # the gyp-generated buildfiles. | 93 # the gyp-generated buildfiles. |
| 95 .PHONY: $(VALID_TARGETS) | 94 .PHONY: $(VALID_TARGETS) |
| 96 $(VALID_TARGETS):: gyp | 95 $(VALID_TARGETS):: gyp |
| 97 ninja -C $(SKIA_OUT)/$(BUILDTYPE) $@ | 96 ninja -C $(SKIA_OUT)/$(BUILDTYPE) $@ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1537903003:
Revert of Add visualbench as valid target to Makefile (Closed)
Base URL: https://skia.googlesource.com/skia.git@master