winlin

add --x86-64 alias for --x86-x64.

@@ -184,6 +184,7 @@ Presets: @@ -184,6 +184,7 @@ Presets:
184 --fast-dev for dev fast compile, the RTMP server, without librtmp/utest/research. 184 --fast-dev for dev fast compile, the RTMP server, without librtmp/utest/research.
185 --demo for srs demo, @see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleDemo 185 --demo for srs demo, @see: https://github.com/simple-rtmp-server/srs/wiki/v1_CN_SampleDemo
186 --full enable all features, no gperf/gprof/arm. 186 --full enable all features, no gperf/gprof/arm.
  187 + --x86-64 alias for --x86-x64.
187 188
188 Conflicts: 189 Conflicts:
189 1. --with-gmc vs --with-gmp: 190 1. --with-gmc vs --with-gmp:
@@ -275,6 +276,7 @@ function parse_user_option() { @@ -275,6 +276,7 @@ function parse_user_option() {
275 --log-trace) SRS_LOG_TRACE=YES ;; 276 --log-trace) SRS_LOG_TRACE=YES ;;
276 277
277 --x86-x64) SRS_X86_X64=YES ;; 278 --x86-x64) SRS_X86_X64=YES ;;
  279 + --x86-64) SRS_X86_X64=YES ;;
278 --osx) SRS_OSX=YES ;; 280 --osx) SRS_OSX=YES ;;
279 --arm) SRS_ARM_UBUNTU12=YES ;; 281 --arm) SRS_ARM_UBUNTU12=YES ;;
280 --mips) SRS_MIPS_UBUNTU12=YES ;; 282 --mips) SRS_MIPS_UBUNTU12=YES ;;
@@ -35,6 +35,7 @@ do @@ -35,6 +35,7 @@ do
35 --help) help=yes ;; 35 --help) help=yes ;;
36 36
37 --x86-x64) X86_X64=YES ;; 37 --x86-x64) X86_X64=YES ;;
  38 + --x86-64) X86_X64=YES ;;
38 --mips) MIPS=YES ;; 39 --mips) MIPS=YES ;;
39 --arm) ARM=YES ;; 40 --arm) ARM=YES ;;
40 --pi) PI=YES ;; 41 --pi) PI=YES ;;
@@ -54,6 +55,7 @@ if [ $help = yes ]; then @@ -54,6 +55,7 @@ if [ $help = yes ]; then
54 --arm for arm cross-build platform, configure/make/package. 55 --arm for arm cross-build platform, configure/make/package.
55 --mips for mips cross-build platform, configure/make/package. 56 --mips for mips cross-build platform, configure/make/package.
56 --pi for pi platform, configure/make/package. 57 --pi for pi platform, configure/make/package.
  58 + --x86-64 alias for --x86-x64.
57 END 59 END
58 exit 0 60 exit 0
59 fi 61 fi