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
120797e2
Commit
120797e2
authored
11 years ago
by
Diego Biurrun
Browse files
Options
Downloads
Patches
Plain Diff
configure: Separate MinGW32 and MinGW64 libc handling
parent
9aa053ce
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
configure
+9
-6
9 additions, 6 deletions
configure
with
9 additions
and
6 deletions
configure
+
9
−
6
View file @
120797e2
...
@@ -3386,12 +3386,15 @@ elif check_cpp_condition features.h "defined __GLIBC__"; then
...
@@ -3386,12 +3386,15 @@ elif check_cpp_condition features.h "defined __GLIBC__"; then
elif
check_cpp_condition newlib.h
"defined _NEWLIB_VERSION"
;
then
elif
check_cpp_condition newlib.h
"defined _NEWLIB_VERSION"
;
then
libc_type
=
newlib
libc_type
=
newlib
add_cppflags
-U__STRICT_ANSI__
add_cppflags
-U__STRICT_ANSI__
elif
check_header _mingw.h
;
then
# MinGW64 is backwards compatible with MinGW32, so check for it first.
libc_type
=
mingw
elif
check_cpp_condition _mingw.h
"defined __MINGW64_VERSION_MAJOR"
;
then
check_cpp_condition _mingw.h
\
libc_type
=
mingw64
"defined (__MINGW64_VERSION_MAJOR) || (__MINGW32_MAJOR_VERSION > 3) ||
\
add_cppflags
-U__STRICT_ANSI__
(__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)"
||
elif
check_cpp_condition _mingw.h
"defined __MINGW32_VERSION"
;
then
die
"ERROR: MinGW runtime version must be >= 3.15."
libc_type
=
mingw32
check_cpp_condition _mingw.h
"__MINGW32_MAJOR_VERSION > 3 ||
\
(__MINGW32_MAJOR_VERSION == 3 && __MINGW32_MINOR_VERSION >= 15)"
||
die
"ERROR: MinGW32 runtime version must be >= 3.15."
add_cppflags
-U__STRICT_ANSI__
add_cppflags
-U__STRICT_ANSI__
elif
check_cpp_condition crtversion.h
"defined _VC_CRT_MAJOR_VERSION"
;
then
elif
check_cpp_condition crtversion.h
"defined _VC_CRT_MAJOR_VERSION"
;
then
libc_type
=
msvcrt
libc_type
=
msvcrt
...
...
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