Mercurial > mplayer.hg
changeset 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 |
| files | configure |
| diffstat | 1 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Mon Jul 28 17:21:36 2008 +0000 +++ b/configure Mon Jul 28 17:33:08 2008 +0000 @@ -1409,9 +1409,6 @@ _exesuf=".exe" _getch=getch2-os2.c _need_shmem=no - _ar="emxomfar -p256" - _ranlib="echo ignoring ranlib" - _ld_extra="$_ld_extra -Zomf -Zstack 16384 -Zbin-files -Zargs-wild -lmmpm2" fi for I in "$TMPDIR" "$TEMPDIR" "/tmp" ; do @@ -7630,6 +7627,14 @@ ############################################################################# + +# On OS/2 nm supports only a.out. So the -Zomf compiler option to generate +# the OMF format needs to come after the 'extern symbol prefix' check, which +# uses nm. +if os2 ; then + _ld_extra="$_ld_extra -Zomf -Zstack 16384 -Zbin-files -Zargs-wild" +fi + # linker paths should be the same for mencoder and mplayer _ld_tmp="" for I in $_libs_mplayer ; do @@ -7663,10 +7668,6 @@ if cygwin ; then CFLAGS="$CFLAGS -D__CYGWIN__" fi -if os2 ; then - CFLAGS="$CFLAGS -Zomf" - ASFLAGS="$ASFLAGS -Zomf" -fi # 64 bit file offsets? if test "$_largefiles" = yes || freebsd ; then CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64" @@ -7733,7 +7734,6 @@ LIBDVDCSS_DVDREAD_FLAGS = $_libdvdcss_dvdread_flags CFLAG_DHAHELPER = $cflag_dhahelper CFLAG_SVGALIB_HELPER = $cflag_svgalib_helper -ASFLAGS = $ASFLAGS EXTRALIBS = $_extra_libs EXTRA_LIB = $_ld_extra $_ld_static $_ld_lm