Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
b2828252
Commit
b2828252
authored
18 years ago
by
Diego Biurrun
Browse files
Options
Downloads
Patches
Plain Diff
Remove redundant TARGET_OS setting.
Originally committed as revision 5833 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
abafc9c3
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
configure
+9
-26
9 additions, 26 deletions
configure
with
9 additions
and
26 deletions
configure
+
9
−
26
View file @
b2828252
...
@@ -582,6 +582,7 @@ MINGW32*)
...
@@ -582,6 +582,7 @@ MINGW32*)
mingw32
=
"yes"
mingw32
=
"yes"
;;
;;
CYGWIN
*
)
CYGWIN
*
)
targetos
=
CYGWIN
shlibdir
=
'${PREFIX}/bin'
shlibdir
=
'${PREFIX}/bin'
v4l
=
"no"
v4l
=
"no"
v4l2
=
"no"
v4l2
=
"no"
...
@@ -599,6 +600,7 @@ SHFLAGS='-shared -Wl,--out-implib=lib$(NAME).dll.a'
...
@@ -599,6 +600,7 @@ SHFLAGS='-shared -Wl,--out-implib=lib$(NAME).dll.a'
Linux
)
Linux
)
;;
;;
IRIX
*
)
IRIX
*
)
targetos
=
IRIX
ranlib
=
"echo ignoring ranlib"
ranlib
=
"echo ignoring ranlib"
v4l
=
"no"
v4l
=
"no"
v4l2
=
"no"
v4l2
=
"no"
...
@@ -630,30 +632,11 @@ vhook="no"
...
@@ -630,30 +632,11 @@ vhook="no"
os2
=
"yes"
os2
=
"yes"
;;
;;
*
)
;;
*
)
targetos
=
"
${
targetos
}
-UNKNOWN"
;;
esac
esac
# From MPlayer configure. We need TARGET_OS available
# to the Makefile, so it can distinguish between flavors
# of AltiVec on PowerPC.
TARGET_OS
=
`
(
uname
-s
)
2>&1
`
case
"
$TARGET_OS
"
in
Linux|FreeBSD|NetBSD|BSD/OS|OpenBSD|SunOS|QNX|Darwin|GNU|BeOS|MorphOS
)
;;
IRIX
*
)
TARGET_OS
=
IRIX
;;
HP-UX
*
)
TARGET_OS
=
HP-UX
;;
[
cC][yY][gG][wW][iI][nN]
*
)
TARGET_OS
=
CYGWIN
;;
*
)
TARGET_OS
=
"
$TARGET_OS
-UNKNOWN"
;;
esac
# find source path
# find source path
source_path
=
"
`
dirname
$0
`
"
source_path
=
"
`
dirname
$0
`
"
source_path_used
=
"yes"
source_path_used
=
"yes"
...
@@ -1604,7 +1587,7 @@ fi
...
@@ -1604,7 +1587,7 @@ fi
echo
"SLIBPREF=
$SLIBPREF
"
>>
config.mak
echo
"SLIBPREF=
$SLIBPREF
"
>>
config.mak
echo
"SLIBSUF=
\$
{BUILDSUF}
$SLIBSUF
"
>>
config.mak
echo
"SLIBSUF=
\$
{BUILDSUF}
$SLIBSUF
"
>>
config.mak
echo
"EXESUF=
\$
{BUILDSUF}
$EXESUF
"
>>
config.mak
echo
"EXESUF=
\$
{BUILDSUF}
$EXESUF
"
>>
config.mak
echo
"TARGET_OS=
$
TARGET_OS
"
>>
config.mak
echo
"TARGET_OS=
$
targetos
"
>>
config.mak
if
test
"
$cpu
"
=
"x86"
;
then
if
test
"
$cpu
"
=
"x86"
;
then
echo
"TARGET_ARCH_X86=yes"
>>
config.mak
echo
"TARGET_ARCH_X86=yes"
>>
config.mak
echo
"#define ARCH_X86 1"
>>
$TMPH
echo
"#define ARCH_X86 1"
>>
$TMPH
...
@@ -1949,17 +1932,17 @@ if test "$os2" = "yes" ; then
...
@@ -1949,17 +1932,17 @@ if test "$os2" = "yes" ; then
echo
"#define HAVE_THREADS 1"
>>
$TMPH
echo
"#define HAVE_THREADS 1"
>>
$TMPH
fi
fi
if
test
"
$
TARGET_OS
"
=
"SunOS"
;
then
if
test
"
$
targetos
"
=
"SunOS"
;
then
echo
"#define CONFIG_SUNOS 1"
>>
$TMPH
echo
"#define CONFIG_SUNOS 1"
>>
$TMPH
fi
fi
if
test
"
$
TARGET_OS
"
=
"BeOS"
;
then
if
test
"
$
targetos
"
=
"BeOS"
;
then
echo
"HAVE_BEOSTHREADS=yes"
>>
config.mak
echo
"HAVE_BEOSTHREADS=yes"
>>
config.mak
echo
"#define HAVE_BEOSTHREADS 1"
>>
$TMPH
echo
"#define HAVE_BEOSTHREADS 1"
>>
$TMPH
echo
"#define HAVE_THREADS 1"
>>
$TMPH
echo
"#define HAVE_THREADS 1"
>>
$TMPH
fi
fi
if
test
"
$
TARGET_OS
"
=
"Darwin"
;
then
if
test
"
$
targetos
"
=
"Darwin"
;
then
echo
"#define CONFIG_DARWIN 1"
>>
$TMPH
echo
"#define CONFIG_DARWIN 1"
>>
$TMPH
echo
"CONFIG_DARWIN=yes"
>>
config.mak
echo
"CONFIG_DARWIN=yes"
>>
config.mak
fi
fi
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment