Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
f69f51b3
Commit
f69f51b3
authored
Aug 19, 2012
by
Diego Biurrun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
configure: indentation cosmetics
parent
55e778be
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
28 deletions
+24
-28
configure
configure
+24
-28
No files found.
configure
View file @
f69f51b3
...
@@ -55,7 +55,7 @@ if test "$E1" != 0 || test "$E2" = 0; then
...
@@ -55,7 +55,7 @@ if test "$E1" != 0 || test "$E2" = 0; then
fi
fi
show_help
(){
show_help
(){
cat
<<
EOF
cat
<<
EOF
Usage: configure [options]
Usage: configure [options]
Options: [defaults in brackets after descriptions]
Options: [defaults in brackets after descriptions]
...
@@ -321,7 +321,7 @@ Rerun configure with logging enabled (do not use --disable-logging), and
...
@@ -321,7 +321,7 @@ Rerun configure with logging enabled (do not use --disable-logging), and
include the log this produces with your report.
include the log this produces with your report.
EOF
EOF
else
else
cat
<<
EOF
cat
<<
EOF
Include the log file "
$logfile
" produced by configure as this will help
Include the log file "
$logfile
" produced by configure as this will help
solving the problem.
solving the problem.
EOF
EOF
...
@@ -2804,13 +2804,13 @@ case $target_os in
...
@@ -2804,13 +2804,13 @@ case $target_os in
SLIBNAME_WITH_VERSION
=
'$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
SLIBNAME_WITH_VERSION
=
'$(SLIBPREF)$(NAME)-$(LIBVERSION)$(SLIBSUF)'
SLIBNAME_WITH_MAJOR
=
'$(SLIBPREF)$(shell echo $(NAME) | cut -c1-6)$(LIBMAJOR)$(SLIBSUF)'
SLIBNAME_WITH_MAJOR
=
'$(SLIBPREF)$(shell echo $(NAME) | cut -c1-6)$(LIBMAJOR)$(SLIBSUF)'
SLIB_CREATE_DEF_CMD
=
'echo LIBRARY $(SLIBNAME_WITH_MAJOR) INITINSTANCE TERMINSTANCE > $(SUBDIR)$(NAME).def; \
SLIB_CREATE_DEF_CMD
=
'echo LIBRARY $(SLIBNAME_WITH_MAJOR) INITINSTANCE TERMINSTANCE > $(SUBDIR)$(NAME).def; \
echo PROTMODE >> $(SUBDIR)$(NAME).def; \
echo PROTMODE >> $(SUBDIR)$(NAME).def; \
echo CODE PRELOAD MOVEABLE DISCARDABLE >> $(SUBDIR)$(NAME).def; \
echo CODE PRELOAD MOVEABLE DISCARDABLE >> $(SUBDIR)$(NAME).def; \
echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >> $(SUBDIR)$(NAME).def; \
echo DATA PRELOAD MOVEABLE MULTIPLE NONSHARED >> $(SUBDIR)$(NAME).def; \
echo EXPORTS >> $(SUBDIR)$(NAME).def; \
echo EXPORTS >> $(SUBDIR)$(NAME).def; \
emxexp -o $(OBJS) >> $(SUBDIR)$(NAME).def'
emxexp -o $(OBJS) >> $(SUBDIR)$(NAME).def'
SLIB_EXTRA_CMD
=
'emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.a $(SUBDIR)$(NAME).def; \
SLIB_EXTRA_CMD
=
'emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.a $(SUBDIR)$(NAME).def; \
emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.lib $(SUBDIR)$(NAME).def;'
emximp -o $(SUBDIR)$(LIBPREF)$(NAME)_dll.lib $(SUBDIR)$(NAME).def;'
SLIB_INSTALL_EXTRA_LIB
=
'$(LIBPREF)$(NAME)_dll.a $(LIBPREF)$(NAME)_dll.lib'
SLIB_INSTALL_EXTRA_LIB
=
'$(LIBPREF)$(NAME)_dll.a $(LIBPREF)$(NAME)_dll.lib'
enable
dos_paths
enable
dos_paths
;;
;;
...
@@ -3025,7 +3025,7 @@ elif enabled sparc; then
...
@@ -3025,7 +3025,7 @@ elif enabled sparc; then
enabled vis
&&
enabled vis
&&
check_inline_asm vis
'"pdist %f0, %f0, %f0"'
-mcpu
=
ultrasparc
&&
check_inline_asm vis
'"pdist %f0, %f0, %f0"'
-mcpu
=
ultrasparc
&&
add_cflags
-mcpu
=
ultrasparc
-mtune
=
ultrasparc
add_cflags
-mcpu
=
ultrasparc
-mtune
=
ultrasparc
elif
enabled x86
;
then
elif
enabled x86
;
then
...
@@ -3043,11 +3043,9 @@ elif enabled x86; then
...
@@ -3043,11 +3043,9 @@ elif enabled x86; then
# if the base pointer is used to access it because the
# if the base pointer is used to access it because the
# base pointer is cleared in the inline assembly code.
# base pointer is cleared in the inline assembly code.
check_exec_crash
<<
EOF
&& enable ebp_available
check_exec_crash
<<
EOF
&& enable ebp_available
volatile int i=0;
volatile int i=0;
__asm__ volatile (
__asm__ volatile ("xorl %%ebp, %%ebp" ::: "%ebp");
"xorl %%ebp, %%ebp"
return i;
::: "%ebp");
return i;
EOF
EOF
# check whether EBX is available on x86
# check whether EBX is available on x86
...
@@ -3353,10 +3351,8 @@ if ! disabled vda && check_header VideoDecodeAcceleration/VDADecoder.h; then
...
@@ -3353,10 +3351,8 @@ if ! disabled vda && check_header VideoDecodeAcceleration/VDADecoder.h; then
fi
fi
if
!
disabled vdpau
&&
enabled vdpau_vdpau_h
;
then
if
!
disabled vdpau
&&
enabled vdpau_vdpau_h
;
then
check_cpp_condition
\
check_cpp_condition vdpau/vdpau.h
"defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP"
||
vdpau/vdpau.h
"defined VDP_DECODER_PROFILE_MPEG4_PART2_ASP"
||
{
echolog
"Please upgrade to libvdpau >= 0.2 if you would like vdpau support."
&&
disable vdpau
;
}
{
echolog
"Please upgrade to libvdpau >= 0.2 if you would like vdpau support."
&&
disable vdpau
;
}
fi
fi
enabled debug
&&
add_cflags
-g
"
$debuglevel
"
&&
add_asflags
-g
"
$debuglevel
"
enabled debug
&&
add_cflags
-g
"
$debuglevel
"
&&
add_asflags
-g
"
$debuglevel
"
...
@@ -3773,15 +3769,15 @@ test -n "$WARNINGS" && printf "\n$WARNINGS"
...
@@ -3773,15 +3769,15 @@ test -n "$WARNINGS" && printf "\n$WARNINGS"
# build pkg-config files
# build pkg-config files
pkgconfig_generate
(){
pkgconfig_generate
(){
name
=
$1
name
=
$1
shortname
=
${
name
#lib
}${
build_suffix
}
shortname
=
${
name
#lib
}${
build_suffix
}
comment
=
$2
comment
=
$2
version
=
$3
version
=
$3
libs
=
$4
libs
=
$4
requires
=
$5
requires
=
$5
enabled
${
name
#lib
}
||
return
0
enabled
${
name
#lib
}
||
return
0
mkdir
-p
$name
mkdir
-p
$name
cat
<<
EOF
>
$name
/
$name
.pc
cat
<<
EOF
>
$name
/
$name
.pc
prefix=
$prefix
prefix=
$prefix
exec_prefix=\
${
prefix
}
exec_prefix=\
${
prefix
}
libdir=
$libdir
libdir=
$libdir
...
@@ -3797,7 +3793,7 @@ Libs: -L\${libdir} -l${shortname} $(enabled shared || echo $libs)
...
@@ -3797,7 +3793,7 @@ Libs: -L\${libdir} -l${shortname} $(enabled shared || echo $libs)
Libs.private:
$(
enabled shared
&&
echo
$libs
)
Libs.private:
$(
enabled shared
&&
echo
$libs
)
Cflags: -I\
${
includedir
}
Cflags: -I\
${
includedir
}
EOF
EOF
cat
<<
EOF
>
$name
/
$name
-uninstalled.pc
cat
<<
EOF
>
$name
/
$name
-uninstalled.pc
prefix=
prefix=
exec_prefix=
exec_prefix=
libdir=\
${
pcfiledir
}
libdir=\
${
pcfiledir
}
...
...
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