mirror of
https://github.com/mpv-player/mpv
synced 2025-03-25 04:38:01 +00:00
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 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27363 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
e9aed9cf90
commit
9c40dd44ab
16
configure
vendored
16
configure
vendored
@ -1409,9 +1409,6 @@ if os2 ; then
|
||||
_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 @@ echores "$_dvdnav"
|
||||
|
||||
|
||||
#############################################################################
|
||||
|
||||
# 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 @@ fi
|
||||
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 @@ CFLAG_STACKREALIGN = $_stackrealign
|
||||
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
|
||||
|
Loading…
Reference in New Issue
Block a user