| OLD | NEW |
| 1 # Copyright (c) 2011 The Native Client Authors. All rights reserved. | 1 # Copyright (c) 2011 The Native Client Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 # Makefile for the Photo example. | 5 # Makefile for the Photo example. |
| 6 | 6 |
| 7 .PHONY: all carpe clean | 7 .PHONY: all carpe clean |
| 8 | 8 |
| 9 NACLPORTS_ROOT = ../../.. | 9 NACLPORTS_ROOT = ../../.. |
| 10 INSTALL_DIR ?= $$HOME/Sites/photo | 10 INSTALL_DIR ?= $$HOME/Sites/photo |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 | 98 |
| 99 $(INSTALL_DIR): | 99 $(INSTALL_DIR): |
| 100 mkdir -p $@ | 100 mkdir -p $@ |
| 101 | 101 |
| 102 clean: | 102 clean: |
| 103 -rm -rf $(OBJDIR) $(PHOTO_MODULES) | 103 -rm -rf $(OBJDIR) $(PHOTO_MODULES) |
| 104 | 104 |
| 105 # Build the required packages. | 105 # Build the required packages. |
| 106 $(LIB_JPEG_32): | 106 $(LIB_JPEG_32): |
| 107 (cd $(NACLPORTS_ROOT)/packages/scripts/jpeg-6b; \ | 107 (cd $(NACLPORTS_ROOT)/packages/scripts/jpeg-6b; \ |
| 108 » export NACL_PACKAGES_BITSIZE=32; \ | 108 » export NACL_ARCH=i686; \ |
| 109 ./nacl-jpeg-6b.sh) | 109 ./nacl-jpeg-6b.sh) |
| 110 | 110 |
| 111 $(LIB_JPEG_64): | 111 $(LIB_JPEG_64): |
| 112 (cd $(NACLPORTS_ROOT)/packages/scripts/jpeg-6b; \ | 112 (cd $(NACLPORTS_ROOT)/packages/scripts/jpeg-6b; \ |
| 113 » export NACL_PACKAGES_BITSIZE=64; \ | 113 » export NACL_ARCH=x86_64; \ |
| 114 ./nacl-jpeg-6b.sh) | 114 ./nacl-jpeg-6b.sh) |
| 115 | 115 |
| 116 $(BOOST_SMART_PTR_32): | 116 $(BOOST_SMART_PTR_32): |
| 117 (cd $(NACLPORTS_ROOT)/packages/scripts/boost_1_43_0; \ | 117 (cd $(NACLPORTS_ROOT)/packages/scripts/boost_1_43_0; \ |
| 118 » export NACL_PACKAGES_BITSIZE=32; \ | 118 » export NACL_ARCH=i686; \ |
| 119 ./nacl-boost_1_43_0.sh) | 119 ./nacl-boost_1_43_0.sh) |
| 120 | 120 |
| 121 $(BOOST_SMART_PTR_64): | 121 $(BOOST_SMART_PTR_64): |
| 122 (cd $(NACLPORTS_ROOT)/packages/scripts/boost_1_43_0; \ | 122 (cd $(NACLPORTS_ROOT)/packages/scripts/boost_1_43_0; \ |
| 123 » export NACL_PACKAGES_BITSIZE=64; \ | 123 » export NACL_ARCH=x86_64; \ |
| 124 ./nacl-boost_1_43_0.sh) | 124 ./nacl-boost_1_43_0.sh) |
| 125 | 125 |
| 126 # Download and patch the Carpe sliders. | 126 # Download and patch the Carpe sliders. |
| 127 $(CARPE_FILES): | 127 $(CARPE_FILES): |
| 128 /bin/bash photo_tool.sh | 128 /bin/bash photo_tool.sh |
| OLD | NEW |