Skip to content
Snippets Groups Projects
Commit c0f5b7f1 authored by Måns Rullgård's avatar Måns Rullgård
Browse files

configure: set EXESUF before it is used

Originally committed as revision 16997 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 5317c95b
No related branches found
No related tags found
No related merge requests found
...@@ -1312,6 +1312,10 @@ set_default cc nm ...@@ -1312,6 +1312,10 @@ set_default cc nm
enabled cross_compile || host_cc_default=$cc enabled cross_compile || host_cc_default=$cc
set_default host_cc set_default host_cc
case $target_os in
mingw32*|cygwin*|*-dos|freedos|opendos|os/2*) EXESUF=.exe ;;
esac
# set temporary file name # set temporary file name
: ${TMPDIR:=$TEMPDIR} : ${TMPDIR:=$TEMPDIR}
: ${TMPDIR:=$TMP} : ${TMPDIR:=$TMP}
...@@ -1513,7 +1517,6 @@ case $target_os in ...@@ -1513,7 +1517,6 @@ case $target_os in
disable ffserver disable ffserver
SLIBPREF="" SLIBPREF=""
SLIBSUF=".dll" SLIBSUF=".dll"
EXESUF=".exe"
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)' SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME)-$(LIBMAJOR)$(SLIBSUF)'
SLIB_EXTRA_CMD='-lib /machine:$(LIBTARGET) /def:$$(@:$(SLIBSUF)=.def) /out:$(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)' SLIB_EXTRA_CMD='-lib /machine:$(LIBTARGET) /def:$$(@:$(SLIBSUF)=.def) /out:$(SUBDIR)$(SLIBNAME_WITH_MAJOR:$(SLIBSUF)=.lib)'
...@@ -1540,7 +1543,6 @@ case $target_os in ...@@ -1540,7 +1543,6 @@ case $target_os in
VHOOKSHFLAGS="$VHOOKSHFLAGS -L\$(BUILD_ROOT)/libswscale" VHOOKSHFLAGS="$VHOOKSHFLAGS -L\$(BUILD_ROOT)/libswscale"
VHOOKLIBS="$VHOOKLIBS -lswscale\$(BUILDSUF)" VHOOKLIBS="$VHOOKLIBS -lswscale\$(BUILDSUF)"
fi fi
EXESUF=".exe"
SLIBPREF="cyg" SLIBPREF="cyg"
SLIBSUF=".dll" SLIBSUF=".dll"
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME)-$(LIBVERSION)$(SLIBSUF)'
...@@ -1553,7 +1555,6 @@ case $target_os in ...@@ -1553,7 +1555,6 @@ case $target_os in
disable ffplay ffserver vhook disable ffplay ffserver vhook
disable $INDEV_LIST $OUTDEV_LIST disable $INDEV_LIST $OUTDEV_LIST
network_extralibs="-lsocket" network_extralibs="-lsocket"
EXESUF=".exe"
objformat="coff" objformat="coff"
enable dos_paths enable dos_paths
;; ;;
...@@ -1567,7 +1568,6 @@ case $target_os in ...@@ -1567,7 +1568,6 @@ case $target_os in
os/2*) os/2*)
strip="lxlite" strip="lxlite"
ln_s="cp -f" ln_s="cp -f"
EXESUF=".exe"
FFLDFLAGS="-Zomf -Zbin-files -Zargs-wild -Zmap" FFLDFLAGS="-Zomf -Zbin-files -Zargs-wild -Zmap"
SHFLAGS='$(SUBDIR)$(NAME).def -Zdll -Zomf' SHFLAGS='$(SUBDIR)$(NAME).def -Zdll -Zomf'
FFSERVERLDFLAGS="" FFSERVERLDFLAGS=""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment