Mercurial > mplayer.hg
comparison configure @ 27331:7ad83044dda3
Rework OS/2 configuration with respect to linker output formats.
Since nm only supports a.out on OS/2, the linker options to specify
a different output format need to be added after the check using nm.
based on a patch by KO Myung-Hun, komh chollian net
author | diego |
---|---|
date | Mon, 28 Jul 2008 17:33:08 +0000 |
parents | dfdd77e392e8 |
children | 8d7c1c97bfa8 |
comparison
equal
deleted
inserted
replaced
27330:dfdd77e392e8 | 27331:7ad83044dda3 |
---|---|
1407 | 1407 |
1408 if os2 ; then | 1408 if os2 ; then |
1409 _exesuf=".exe" | 1409 _exesuf=".exe" |
1410 _getch=getch2-os2.c | 1410 _getch=getch2-os2.c |
1411 _need_shmem=no | 1411 _need_shmem=no |
1412 _ar="emxomfar -p256" | |
1413 _ranlib="echo ignoring ranlib" | |
1414 _ld_extra="$_ld_extra -Zomf -Zstack 16384 -Zbin-files -Zargs-wild -lmmpm2" | |
1415 fi | 1412 fi |
1416 | 1413 |
1417 for I in "$TMPDIR" "$TEMPDIR" "/tmp" ; do | 1414 for I in "$TMPDIR" "$TEMPDIR" "/tmp" ; do |
1418 test "$I" && break | 1415 test "$I" && break |
1419 done | 1416 done |
7628 fi | 7625 fi |
7629 echores "$_dvdnav" | 7626 echores "$_dvdnav" |
7630 | 7627 |
7631 | 7628 |
7632 ############################################################################# | 7629 ############################################################################# |
7630 | |
7631 # On OS/2 nm supports only a.out. So the -Zomf compiler option to generate | |
7632 # the OMF format needs to come after the 'extern symbol prefix' check, which | |
7633 # uses nm. | |
7634 if os2 ; then | |
7635 _ld_extra="$_ld_extra -Zomf -Zstack 16384 -Zbin-files -Zargs-wild" | |
7636 fi | |
7637 | |
7633 # linker paths should be the same for mencoder and mplayer | 7638 # linker paths should be the same for mencoder and mplayer |
7634 _ld_tmp="" | 7639 _ld_tmp="" |
7635 for I in $_libs_mplayer ; do | 7640 for I in $_libs_mplayer ; do |
7636 _tmp=`echo $I | sed -e 's/^-L.*$//'` | 7641 _tmp=`echo $I | sed -e 's/^-L.*$//'` |
7637 if test -z "$_tmp" ; then | 7642 if test -z "$_tmp" ; then |
7660 # FIXME bsd needs this so maybe other OS'es | 7665 # FIXME bsd needs this so maybe other OS'es |
7661 CFLAGS="$CFLAGS -D_THREAD_SAFE" | 7666 CFLAGS="$CFLAGS -D_THREAD_SAFE" |
7662 fi | 7667 fi |
7663 if cygwin ; then | 7668 if cygwin ; then |
7664 CFLAGS="$CFLAGS -D__CYGWIN__" | 7669 CFLAGS="$CFLAGS -D__CYGWIN__" |
7665 fi | |
7666 if os2 ; then | |
7667 CFLAGS="$CFLAGS -Zomf" | |
7668 ASFLAGS="$ASFLAGS -Zomf" | |
7669 fi | 7670 fi |
7670 # 64 bit file offsets? | 7671 # 64 bit file offsets? |
7671 if test "$_largefiles" = yes || freebsd ; then | 7672 if test "$_largefiles" = yes || freebsd ; then |
7672 CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" | 7673 CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" |
7673 if test "$_dvdread" = yes || test "$_libdvdcss_internal" = yes ; then | 7674 if test "$_dvdread" = yes || test "$_libdvdcss_internal" = yes ; then |
7731 CXXFLAGS = $CXXFLAGS \$(EXTRAXX_INC) | 7732 CXXFLAGS = $CXXFLAGS \$(EXTRAXX_INC) |
7732 CFLAG_STACKREALIGN = $_stackrealign | 7733 CFLAG_STACKREALIGN = $_stackrealign |
7733 LIBDVDCSS_DVDREAD_FLAGS = $_libdvdcss_dvdread_flags | 7734 LIBDVDCSS_DVDREAD_FLAGS = $_libdvdcss_dvdread_flags |
7734 CFLAG_DHAHELPER = $cflag_dhahelper | 7735 CFLAG_DHAHELPER = $cflag_dhahelper |
7735 CFLAG_SVGALIB_HELPER = $cflag_svgalib_helper | 7736 CFLAG_SVGALIB_HELPER = $cflag_svgalib_helper |
7736 ASFLAGS = $ASFLAGS | |
7737 | 7737 |
7738 EXTRALIBS = $_extra_libs | 7738 EXTRALIBS = $_extra_libs |
7739 EXTRA_LIB = $_ld_extra $_ld_static $_ld_lm | 7739 EXTRA_LIB = $_ld_extra $_ld_static $_ld_lm |
7740 EXTRALIBS_MPLAYER = $_libs_mplayer | 7740 EXTRALIBS_MPLAYER = $_libs_mplayer |
7741 EXTRALIBS_MENCODER = $_libs_mencoder | 7741 EXTRALIBS_MENCODER = $_libs_mencoder |