Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
VideoLAN
x264
Commits
b77cc09b
Commit
b77cc09b
authored
Jan 03, 2015
by
Anton Mitrofanov
Browse files
Fix ARCH variable name conflict with BSD ports (bsd.port.mk) read-only variable
parent
6e769846
Changes
2
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
b77cc09b
...
...
@@ -87,12 +87,12 @@ X86SRC0 += sad-a.asm
endif
X86SRC
=
$
(
X86SRC0:%
=
common/x86/%
)
ifeq
($(ARCH),X86)
ifeq
($(
SYS_
ARCH),X86)
ARCH_X86
=
yes
ASMSRC
=
$(X86SRC)
common/x86/pixel-32.asm
endif
ifeq
($(ARCH),X86_64)
ifeq
($(
SYS_
ARCH),X86_64)
ARCH_X86
=
yes
ASMSRC
=
$
(
X86SRC:-32.asm
=
-64
.asm
)
common/x86/trellis-64.asm
endif
...
...
@@ -106,7 +106,7 @@ endif
endif
# AltiVec optims
ifeq
($(ARCH),PPC)
ifeq
($(
SYS_
ARCH),PPC)
ifneq
($(AS),)
SRCS
+=
common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c
\
common/ppc/quant.c common/ppc/deblock.c
\
...
...
@@ -115,7 +115,7 @@ endif
endif
# NEON optims
ifeq
($(ARCH),ARM)
ifeq
($(
SYS_
ARCH),ARM)
ifneq
($(AS),)
ASMSRC
+=
common/arm/cpu-a.S common/arm/pixel-a.S common/arm/mc-a.S
\
common/arm/dct-a.S common/arm/quant-a.S common/arm/deblock-a.S
\
...
...
@@ -126,7 +126,7 @@ endif
endif
# AArch64 NEON optims
ifeq
($(ARCH),AARCH64)
ifeq
($(
SYS_
ARCH),AARCH64)
ifneq
($(AS),)
ASMSRC
+=
common/aarch64/bitstream-a.S
\
common/aarch64/cabac-a.S
\
...
...
configure
View file @
b77cc09b
...
...
@@ -1211,7 +1211,7 @@ exec_prefix=$exec_prefix
bindir=
$bindir
libdir=
$libdir
includedir=
$includedir
ARCH=
$ARCH
SYS_
ARCH=
$ARCH
SYS=
$SYS
CC=
$CC
CFLAGS=
$CFLAGS
...
...
Write
Preview
Supports
Markdown
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