Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Raphael Zumer
aom-rav1e
Commits
ceef0583
Commit
ceef0583
authored
Mar 24, 2016
by
Yaowu Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
libvpx->libaom part2
Change-Id: Ic5681730d0edd0ab4c46da13d21510ca8900fdb3
parent
3d26d916
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
examples.mk
examples.mk
+1
-1
libs.mk
libs.mk
+4
-4
No files found.
examples.mk
View file @
ceef0583
...
...
@@ -225,7 +225,7 @@ BINS-$(NOT_MSVS) += $(addprefix $(BUILD_PFX),$(ALL_EXAMPLES:.c=$(EXE_S
# Instantiate linker template for all examples.
CODEC_LIB
=
$(
if
$(CONFIG_DEBUG_LIBS)
,
vpx_g,vpx
)
CODEC_LIB
=
$(
if
$(CONFIG_DEBUG_LIBS)
,
aom_g,aom
)
ifneq
($(filter darwin%,$(TGT_OS)),)
SHARED_LIB_SUF
=
.dylib
else
...
...
libs.mk
View file @
ceef0583
...
...
@@ -297,7 +297,7 @@ vpx.pc: config.mk libs.mk
$(qexec)
echo
'Version:
$(VERSION_MAJOR)
.
$(VERSION_MINOR)
.
$(VERSION_PATCH)
'
>>
$@
$(qexec)
echo
'Requires:'
>>
$@
$(qexec)
echo
'Conflicts:'
>>
$@
$(qexec)
echo
'Libs: -L$
${libdir}
-l
vpx
-lm'
>>
$@
$(qexec)
echo
'Libs: -L$
${libdir}
-l
aom
-lm'
>>
$@
ifeq
($(HAVE_PTHREAD_H),yes)
$(qexec)
echo
'Libs.private: -lm -lpthread'
>>
$@
else
...
...
@@ -458,13 +458,13 @@ $(LIBAOM_TEST_OBJS) $(LIBAOM_TEST_OBJS:.o=.d): CXXFLAGS += $(GTEST_INCLUDES)
OBJS-yes
+=
$(LIBAOM_TEST_OBJS)
BINS-yes
+=
$(LIBAOM_TEST_BIN)
CODEC_LIB
=
$(
if
$(CONFIG_DEBUG_LIBS)
,
vpx_g,vpx
)
CODEC_LIB
=
$(
if
$(CONFIG_DEBUG_LIBS)
,
aom_g,aom
)
CODEC_LIB_SUF
=
$(
if
$(CONFIG_SHARED)
,
$(SHARED_LIB_SUF)
,.a
)
TEST_LIBS
:=
lib
$(CODEC_LIB)$(CODEC_LIB_SUF)
libgtest.a
$(LIBAOM_TEST_BIN)
:
$(TEST_LIBS)
$(eval
$(call
linkerxx_template,$(LIBAOM_TEST_BIN),
\
$(LIBAOM_TEST_OBJS)
\
-L.
-l
vpx
-lgtest
$(extralibs)
-lm))
-L.
-l
aom
-lgtest
$(extralibs)
-lm))
ifneq
($(strip $(TEST_INTRA_PRED_SPEED_OBJS)),)
$(TEST_INTRA_PRED_SPEED_OBJS) $(TEST_INTRA_PRED_SPEED_OBJS
:
.o=.d): CXXFLAGS += $(GTEST_INCLUDES)
...
...
@@ -474,7 +474,7 @@ BINS-yes += $(TEST_INTRA_PRED_SPEED_BIN)
$(TEST_INTRA_PRED_SPEED_BIN)
:
$(TEST_LIBS)
$(eval
$(call
linkerxx_template,$(TEST_INTRA_PRED_SPEED_BIN),
\
$(TEST_INTRA_PRED_SPEED_OBJS)
\
-L.
-l
vpx
-lgtest
$(extralibs)
-lm))
-L.
-l
aom
-lgtest
$(extralibs)
-lm))
endif
# TEST_INTRA_PRED_SPEED
endif
# CONFIG_UNIT_TESTS
...
...
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