Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
48860df3
Commit
48860df3
authored
Apr 19, 2019
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: Add .exe suffix to toolchain calls.
Allows in-tree msvc compilation with wsl.
parent
838710bd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
8 deletions
+8
-8
mslink
compat/windows/mslink
+1
-1
configure
configure
+7
-7
No files found.
compat/windows/mslink
View file @
48860df3
...
@@ -4,6 +4,6 @@ LINK_EXE_PATH=$(dirname "$(command -v cl)")/link
...
@@ -4,6 +4,6 @@ LINK_EXE_PATH=$(dirname "$(command -v cl)")/link
if
[
-x
"
$LINK_EXE_PATH
"
]
;
then
if
[
-x
"
$LINK_EXE_PATH
"
]
;
then
"
$LINK_EXE_PATH
"
$@
"
$LINK_EXE_PATH
"
$@
else
else
link
$@
link
.exe
$@
fi
fi
exit
$?
exit
$?
configure
View file @
48860df3
...
@@ -4112,22 +4112,22 @@ case "$toolchain" in
...
@@ -4112,22 +4112,22 @@ case "$toolchain" in
# behaviour if the regexp was unable to match anything, since this
# behaviour if the regexp was unable to match anything, since this
# successfully parses the version number of existing supported
# successfully parses the version number of existing supported
# versions that require the converter (MSVC 2010 and 2012).
# versions that require the converter (MSVC 2010 and 2012).
cl_major_ver
=
$(
cl 2>&1 |
sed
-n
's/.*Version \([[:digit:]]\{1,\}\)\..*/\1/p'
)
cl_major_ver
=
$(
cl
.exe
2>&1 |
sed
-n
's/.*Version \([[:digit:]]\{1,\}\)\..*/\1/p'
)
if
[
-z
"
$cl_major_ver
"
]
||
[
$cl_major_ver
-ge
18
]
;
then
if
[
-z
"
$cl_major_ver
"
]
||
[
$cl_major_ver
-ge
18
]
;
then
cc_default
=
"cl"
cc_default
=
"cl
.exe
"
cxx_default
=
"cl"
cxx_default
=
"cl
.exe
"
else
else
die
"Unsupported MSVC version (2013 or newer required)"
die
"Unsupported MSVC version (2013 or newer required)"
fi
fi
ld_default
=
"
$source_path
/compat/windows/mslink"
ld_default
=
"
$source_path
/compat/windows/mslink"
nm_default
=
"dumpbin -symbols"
nm_default
=
"dumpbin
.exe
-symbols"
ar_default
=
"lib"
ar_default
=
"lib
.exe
"
case
"
$arch
"
in
case
"
$arch
"
in
aarch64|arm64
)
aarch64|arm64
)
as_default
=
"armasm64"
as_default
=
"armasm64
.exe
"
;;
;;
arm
*
)
arm
*
)
as_default
=
"armasm"
as_default
=
"armasm
.exe
"
;;
;;
esac
esac
target_os_default
=
"win32"
target_os_default
=
"win32"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment