| 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 30 matching lines...) Expand all  Loading... | 
|   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                  pdfviewer \ | 
|   47                  SampleApp \ |   47                  SampleApp \ | 
|   48                  SampleApp_APK \ |   48                  SampleApp_APK \ | 
|   49                  skhello \ |   49                  skhello \ | 
|   50                  skia_lib \ |   50                  skia_lib \ | 
 |   51                  skpskgr_test \ | 
|   51                  tests \ |   52                  tests \ | 
|   52                  tools \ |   53                  tools \ | 
|   53                  skpdiff |   54                  skpdiff | 
|   54  |   55  | 
|   55 # Default target.  This must be listed before all other targets. |   56 # Default target.  This must be listed before all other targets. | 
|   56 .PHONY: default |   57 .PHONY: default | 
|   57 default: most |   58 default: most | 
|   58  |   59  | 
|   59 # As noted in http://code.google.com/p/skia/issues/detail?id=330 , building |   60 # As noted in http://code.google.com/p/skia/issues/detail?id=330 , building | 
|   60 # multiple targets in parallel was failing.  The special .NOTPARALLEL target |   61 # multiple targets in parallel was failing.  The special .NOTPARALLEL target | 
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  120 else ifneq (,$(findstring make, $(GYP_GENERATORS))) |  121 else ifneq (,$(findstring make, $(GYP_GENERATORS))) | 
|  121         $(MAKE) -C $(SKIA_OUT) $@ BUILDTYPE=$(BUILDTYPE) |  122         $(MAKE) -C $(SKIA_OUT) $@ BUILDTYPE=$(BUILDTYPE) | 
|  122 else ifneq (,$(findstring Darwin, $(uname))) |  123 else ifneq (,$(findstring Darwin, $(uname))) | 
|  123         rm -f out/$(BUILDTYPE) || if test -d out/$(BUILDTYPE); then echo "run 'm
     ake clean' or otherwise delete out/$(BUILDTYPE)"; exit 1; fi |  124         rm -f out/$(BUILDTYPE) || if test -d out/$(BUILDTYPE); then echo "run 'm
     ake clean' or otherwise delete out/$(BUILDTYPE)"; exit 1; fi | 
|  124         xcodebuild -project out/gyp/$@.xcodeproj -configuration $(BUILDTYPE) |  125         xcodebuild -project out/gyp/$@.xcodeproj -configuration $(BUILDTYPE) | 
|  125         ln -s $(CWD)/xcodebuild/$(BUILDTYPE) out/$(BUILDTYPE) |  126         ln -s $(CWD)/xcodebuild/$(BUILDTYPE) out/$(BUILDTYPE) | 
|  126 else |  127 else | 
|  127         echo "unknown platform $(uname)" |  128         echo "unknown platform $(uname)" | 
|  128         exit 1 |  129         exit 1 | 
|  129 endif |  130 endif | 
| OLD | NEW |