Commit 4f854758 authored by Diego Biurrun's avatar Diego Biurrun

cosmetics: Rename targetos variable to target_os.

Originally committed as revision 12587 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent db6107b6
...@@ -108,7 +108,7 @@ show_help(){ ...@@ -108,7 +108,7 @@ show_help(){
echo " --source-path=PATH path to source code [$source_path]" echo " --source-path=PATH path to source code [$source_path]"
echo " --cross-prefix=PREFIX use PREFIX for compilation tools [$cross_prefix]" echo " --cross-prefix=PREFIX use PREFIX for compilation tools [$cross_prefix]"
echo " --enable-cross-compile assume a cross-compiler is used" echo " --enable-cross-compile assume a cross-compiler is used"
echo " --target-os=OS compiler targets OS [$targetos]" echo " --target-os=OS compiler targets OS [$target_os]"
echo " --cc=CC use C compiler CC [$cc]" echo " --cc=CC use C compiler CC [$cc]"
echo " --make=MAKE use specified make [$make]" echo " --make=MAKE use specified make [$make]"
echo " --extra-cflags=ECFLAGS add ECFLAGS to CFLAGS [$CFLAGS]" echo " --extra-cflags=ECFLAGS add ECFLAGS to CFLAGS [$CFLAGS]"
...@@ -894,7 +894,7 @@ arch=`uname -m` ...@@ -894,7 +894,7 @@ arch=`uname -m`
cpu="generic" cpu="generic"
# OS # OS
targetos=$(tolower $(uname -s)) target_os=$(tolower $(uname -s))
# libraries # libraries
enable zlib enable zlib
...@@ -1009,7 +1009,7 @@ for opt do ...@@ -1009,7 +1009,7 @@ for opt do
;; ;;
--cross-prefix=*) cross_prefix="$optval" --cross-prefix=*) cross_prefix="$optval"
;; ;;
--target-os=*) targetos="$optval" --target-os=*) target_os="$optval"
;; ;;
--cc=*) cc="$optval" --cc=*) cc="$optval"
;; ;;
...@@ -1138,7 +1138,7 @@ enabled_any x86_32 x86_64 && enable x86 ...@@ -1138,7 +1138,7 @@ enabled_any x86_32 x86_64 && enable x86
enabled sparc64 && enable sparc enabled sparc64 && enable sparc
# OS specific # OS specific
case $targetos in case $target_os in
beos|haiku|zeta) beos|haiku|zeta)
PREFIX="$HOME/config" PREFIX="$HOME/config"
# helps building libavcodec # helps building libavcodec
...@@ -1203,7 +1203,7 @@ case $targetos in ...@@ -1203,7 +1203,7 @@ case $targetos in
FFSERVERLDFLAGS=-Wl,-bind_at_load FFSERVERLDFLAGS=-Wl,-bind_at_load
;; ;;
mingw32*) mingw32*)
targetos=mingw32 target_os=mingw32
shlibdir="$bindir" shlibdir="$bindir"
VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil' VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'
VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)' VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)'
...@@ -1223,7 +1223,7 @@ case $targetos in ...@@ -1223,7 +1223,7 @@ case $targetos in
SHFLAGS='-shared -Wl,--output-def,$(@:$(SLIBSUF)=.def) -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base' SHFLAGS='-shared -Wl,--output-def,$(@:$(SLIBSUF)=.def) -Wl,--enable-runtime-pseudo-reloc -Wl,--enable-auto-image-base'
;; ;;
cygwin*) cygwin*)
targetos=cygwin target_os=cygwin
shlibdir="$bindir" shlibdir="$bindir"
VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil' VHOOKSHFLAGS='-shared -L$(BUILD_ROOT)/libavformat -L$(BUILD_ROOT)/libavcodec -L$(BUILD_ROOT)/libavutil'
VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)' VHOOKLIBS='-lavformat$(BUILDSUF) -lavcodec$(BUILDSUF) -lavutil$(BUILDSUF) $(EXTRALIBS)'
...@@ -1249,7 +1249,7 @@ case $targetos in ...@@ -1249,7 +1249,7 @@ case $targetos in
enable dv1394 enable dv1394
;; ;;
irix*) irix*)
targetos=irix target_os=irix
ranlib="echo ignoring ranlib" ranlib="echo ignoring ranlib"
;; ;;
os/2*) os/2*)
...@@ -1281,7 +1281,7 @@ case $targetos in ...@@ -1281,7 +1281,7 @@ case $targetos in
;; ;;
*) *)
targetos="${targetos}-UNKNOWN" target_os="${target_os}-UNKNOWN"
;; ;;
esac esac
...@@ -1371,7 +1371,7 @@ check_deps $ARCH_EXT_LIST ...@@ -1371,7 +1371,7 @@ check_deps $ARCH_EXT_LIST
test -z "$need_memalign" && need_memalign="$mmx" test -z "$need_memalign" && need_memalign="$mmx"
#Darwin CC versions #Darwin CC versions
if test $targetos = darwin; then if test $target_os = darwin; then
if $cc -v 2>&1 | grep -q xlc; then if $cc -v 2>&1 | grep -q xlc; then
add_cflags "-qpdf2 -qlanglvl=extc99 -qmaxmem=-1 -qarch=auto -qtune=auto" add_cflags "-qpdf2 -qlanglvl=extc99 -qmaxmem=-1 -qarch=auto -qtune=auto"
else else
...@@ -1684,7 +1684,7 @@ done ...@@ -1684,7 +1684,7 @@ done
test "$vhook" = "default" && vhook="$dlopen" test "$vhook" = "default" && vhook="$dlopen"
if test "$targetos" = cygwin -o "$targetos" = mingw32 && enabled_all static vhook ; then if test "$target_os" = cygwin -o "$target_os" = mingw32 && enabled_all static vhook ; then
disable vhook disable vhook
echo echo
echo "At the moment vhooks don't work on Cygwin or MinGW static builds." echo "At the moment vhooks don't work on Cygwin or MinGW static builds."
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment