generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gcc always #defines __MINGW32__ on mingw targets

Browse Source 
Originally committed as revision 7091 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Måns Rullgård 2006-11-15 22:33:39 +00:00
parent 02f9d8fb95
commit 860391a53e
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configure vendored
View File

@ -421,6 +421,7 @@ CONFIG_LIST='
vhook vhook
video4linux video4linux
video4linux2 video4linux2
wince
x264 x264
xvid xvid
zlib zlib
@ -572,7 +573,7 @@ a52bin="no"
dts="no" dts="no"
pp="no" pp="no"
mingw32="no" mingw32="no"
mingwce="no" wince="no"
os2="no" os2="no"
lstatic="yes" lstatic="yes"
lshared="no" lshared="no"
@ -933,7 +934,7 @@ for opt do
;; ;;
--enable-mingw32) mingw32="yes" --enable-mingw32) mingw32="yes"
;; ;;
--enable-mingwce) mingwce="yes" --enable-mingwce) wince="yes"
;; ;;
--enable-static) lstatic="yes" --enable-static) lstatic="yes"
;; ;;
@ -1029,7 +1030,7 @@ else
logfile=/dev/null logfile=/dev/null
fi fi
if test "$mingw32" = "yes" -o "$mingwce" = "yes"; then if test "$mingw32" = "yes" -o "$wince" = "yes"; then
if test "$lshared" = "yes" && test "$lstatic" = "yes" ; then if test "$lshared" = "yes" && test "$lstatic" = "yes" ; then
cat <<EOF cat <<EOF
You can only build one library type at once on MinGW. You can only build one library type at once on MinGW.
@ -1050,7 +1051,7 @@ EOF
if enabled mingw32; then if enabled mingw32; then
w32threads="yes" w32threads="yes"
fi fi
if test "$mingwce" = "yes"; then if test "$wince" = "yes"; then
protocols="no" protocols="no"
fi fi
SLIBPREF="" SLIBPREF=""
@ -1955,19 +1956,6 @@ enabled_any pthreads beosthreads os2threads w32threads && enable threads
print_config HAVE_ $TMPH config.mak $HAVE_LIST print_config HAVE_ $TMPH config.mak $HAVE_LIST
print_config CONFIG_ $TMPH config.mak $CONFIG_LIST print_config CONFIG_ $TMPH config.mak $CONFIG_LIST
if test "$mingw32" = "yes" ; then
echo "#ifndef __MINGW32__" >> $TMPH
echo "#define __MINGW32__ 1" >> $TMPH
echo "#endif" >> $TMPH
fi
if test "$mingwce" = "yes" ; then
echo "#define CONFIG_WINCE 1" >> $TMPH
echo "#ifndef __MINGW32__" >> $TMPH
echo "#define __MINGW32__ 1" >> $TMPH
echo "#endif" >> $TMPH
fi
if test "$os2" = "yes" ; then if test "$os2" = "yes" ; then
echo "#define CONFIG_OS2 1" >> $TMPH echo "#define CONFIG_OS2 1" >> $TMPH
fi fi