Originally committed as revision 19471 to svn://svn.ffmpeg.org/ffmpeg/trunk
Måns Rullgård authored on 2009/07/21 04:00:59... | ... |
@@ -1002,7 +1002,6 @@ CMDLINE_SET=" |
1002 | 1002 |
cpu |
1003 | 1003 |
cross_prefix |
1004 | 1004 |
dep_cc |
1005 |
- extra_cflags |
|
1006 | 1005 |
extra_version |
1007 | 1006 |
host_cc |
1008 | 1007 |
host_cflags |
... | ... |
@@ -1020,6 +1019,10 @@ CMDLINE_SET=" |
1020 | 1020 |
target_path |
1021 | 1021 |
" |
1022 | 1022 |
|
1023 |
+CMDLINE_APPEND=" |
|
1024 |
+ extra_cflags |
|
1025 |
+" |
|
1026 |
+ |
|
1023 | 1027 |
# code dependency declarations |
1024 | 1028 |
|
1025 | 1029 |
# architecture extensions |
... | ... |
@@ -1401,8 +1404,13 @@ for opt do |
1401 | 1401 |
optname="${opt%%=*}" |
1402 | 1402 |
optname="${optname#--}" |
1403 | 1403 |
optname=$(echo "$optname" | sed 's/-/_/g') |
1404 |
- is_in $optname $CMDLINE_SET || die_unknown $opt |
|
1405 |
- eval $optname='$optval' |
|
1404 |
+ if is_in $optname $CMDLINE_SET; then |
|
1405 |
+ eval $optname='$optval' |
|
1406 |
+ elif is_in $optname $CMDLINE_APPEND; then |
|
1407 |
+ append $optname "$optval" |
|
1408 |
+ else |
|
1409 |
+ die_unknown $opt |
|
1410 |
+ fi |
|
1406 | 1411 |
;; |
1407 | 1412 |
esac |
1408 | 1413 |
done |