| OLD | NEW |
| 1 #!/bin/bash -e | 1 #!/bin/bash -e |
| 2 # | 2 # |
| 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 3 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be |
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. |
| 6 | 6 |
| 7 # This script is used to generate .gypi, .gni files and files in the | 7 # This script is used to generate .gypi, .gni files and files in the |
| 8 # config/platform directories needed to build libvpx. | 8 # config/platform directories needed to build libvpx. |
| 9 # Every time libvpx source code is updated just run this script. | 9 # Every time libvpx source code is updated just run this script. |
| 10 # | 10 # |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 echo " ]," >> "$2" | 162 echo " ]," >> "$2" |
| 163 echo " 'cflags': [ '-m$4', ]," >> "$2" | 163 echo " 'cflags': [ '-m$4', ]," >> "$2" |
| 164 echo " 'asmflags': [ '-m$4', ]," >> "$2" | 164 echo " 'asmflags': [ '-m$4', ]," >> "$2" |
| 165 else | 165 else |
| 166 echo " 'cflags': [ '-m$4', ]," >> "$2" | 166 echo " 'cflags': [ '-m$4', ]," >> "$2" |
| 167 echo " 'xcode_settings': { 'OTHER_CFLAGS': [ '-m$4' ] }," >> "$2" | 167 echo " 'xcode_settings': { 'OTHER_CFLAGS': [ '-m$4' ] }," >> "$2" |
| 168 fi | 168 fi |
| 169 if [[ -z $DISABLE_AVX && $4 == avx ]]; then | 169 if [[ -z $DISABLE_AVX && $4 == avx ]]; then |
| 170 echo " 'msvs_settings': {" >> "$2" | 170 echo " 'msvs_settings': {" >> "$2" |
| 171 echo " 'VCCLCompilerTool': {" >> "$2" | 171 echo " 'VCCLCompilerTool': {" >> "$2" |
| 172 echo " 'EnableEnhancedInstructionSet': '4', # /arch:AVX" >> "$2" | 172 echo " 'EnableEnhancedInstructionSet': '3', # /arch:AVX" >> "$2" |
| 173 echo " }," >> "$2" | 173 echo " }," >> "$2" |
| 174 echo " }," >> "$2" | 174 echo " }," >> "$2" |
| 175 fi | 175 fi |
| 176 if [[ -z $DISABLE_AVX && $4 == avx2 ]]; then | 176 if [[ -z $DISABLE_AVX && $4 == avx2 ]]; then |
| 177 echo " 'msvs_settings': {" >> "$2" | 177 echo " 'msvs_settings': {" >> "$2" |
| 178 echo " 'VCCLCompilerTool': {" >> "$2" | 178 echo " 'VCCLCompilerTool': {" >> "$2" |
| 179 echo " 'EnableEnhancedInstructionSet': '5', # /arch:AVX2" >> "$2" | 179 echo " 'EnableEnhancedInstructionSet': '5', # /arch:AVX2" >> "$2" |
| 180 echo " }," >> "$2" | 180 echo " }," >> "$2" |
| 181 echo " }," >> "$2" | 181 echo " }," >> "$2" |
| 182 fi | 182 fi |
| (...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 594 gn format --in-place $BASE_DIR/libvpx_srcs.gni | 594 gn format --in-place $BASE_DIR/libvpx_srcs.gni |
| 595 | 595 |
| 596 cd $BASE_DIR/$LIBVPX_SRC_DIR | 596 cd $BASE_DIR/$LIBVPX_SRC_DIR |
| 597 echo | 597 echo |
| 598 echo "Update README.chromium:" | 598 echo "Update README.chromium:" |
| 599 git log -1 --format="%cd%nCommit: %H" --date=format:"Date: %A %B %d %Y" | 599 git log -1 --format="%cd%nCommit: %H" --date=format:"Date: %A %B %d %Y" |
| 600 | 600 |
| 601 cd $BASE_DIR | 601 cd $BASE_DIR |
| 602 | 602 |
| 603 # TODO(fgalligan): Can we turn on "--enable-realtime-only" for mipsel? | 603 # TODO(fgalligan): Can we turn on "--enable-realtime-only" for mipsel? |
| OLD | NEW |