Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Xiph.Org
aom-rav1e
Commits
30fb976e
Commit
30fb976e
authored
Jun 11, 2012
by
John Koleszar
Committed by
Gerrit Code Review
Jun 11, 2012
Browse files
Merge "Fix MSVS builds for unit test changes"
parents
52ec78be
7f63bfa6
Changes
2
Hide whitespace changes
Inline
Side-by-side
libs.mk
View file @
30fb976e
...
...
@@ -375,25 +375,20 @@ gtest.vcproj: $(SRC_PATH_BARE)/third_party/googletest/src/src/gtest-all.cc
PROJECTS-$(CONFIG_MSVS)
+=
gtest.vcproj
define
unit_test_vcproj_template
$(notdir $(1
:
.cc=.vcproj)): $(SRC_PATH_BARE)/$(1)
@
echo
" [vcproj]
$$
@"
$
$(SRC_PATH_BARE)
/build/make/gen_msvs_proj.sh
\
--
exe
\
--
target
=
$
$(TOOLCHAIN)
\
--
name
=
$(
notdir
$(1:.cc=)
)
\
--ver
=
$
$
(CONFIG_VS_VERSION)
\
$
$(
if
$
$(CONFIG_STATIC_MSVCRT)
,--static-crt
)
\
--out
=
$
$
@
$
$(INTERNAL_CFLAGS)
$
$(CFLAGS)
\
test_libvpx.vcproj
:
$(LIBVPX_TEST_SRCS)
@
echo
" [CREATE]
$@
"
$(SRC_PATH_BARE)
/build/make/gen_msvs_proj.sh
\
--exe
\
--
target
=
$(TOOLCHAIN)
\
--
name
=
test_libvpx
\
--
proj-guid
=
CD837F5F-52D8-4314-A370-895D614166A7
\
--ver
=
$(CONFIG_VS_VERSION)
\
$(
if
$(CONFIG_STATIC_MSVCRT)
,--static-crt
)
\
--out
=
$@
$(INTERNAL_CFLAGS)
$(CFLAGS)
\
-I
.
-I
"
$(SRC_PATH_BARE)
/third_party/googletest/src/include"
\
-L
.
-l
$(CODEC_LIB)
-lwinmm
-l
$(GTEST_LIB)
$$
^
endef
$(foreach
proj,$(LIBVPX_TEST_BINS),\
$(eval
$(call
unit_test_vcproj_template,$(proj))))
-L
.
-l
$(CODEC_LIB)
-lwinmm
-l
$(GTEST_LIB)
$^
PROJECTS-$(CONFIG_MSVS)
+=
$(
foreach
proj,
$(LIBVPX_TEST_BINS)
,
\
$(
notdir
$(proj:.cc=.vcproj)
))
PROJECTS-$(CONFIG_MSVS)
+=
test_libvpx.vcproj
test
::
@
set
-e
;
for
t
in
$(
addprefix
Win32/Release/,
$(
notdir
$(LIBVPX_TEST_BINS:.cc=.exe)
))
;
do
$$
t
;
done
...
...
solution.mk
View file @
30fb976e
...
...
@@ -8,18 +8,19 @@
## be found in the AUTHORS file in the root of the source tree.
##
# libvpx reverse dependencies (targets that depend on libvpx)
VPX_NONDEPS
=
$(
addsuffix
.vcproj,vpx gtest obj_int_extract
)
VPX_RDEPS
=
$(
foreach
vcp,
\
$(
filter-out
$(VPX_NONDEPS)
,
$^
)
,
--dep
=
$(vcp:.vcproj=)
:vpx
)
vpx.sln
:
$(wildcard *.vcproj)
@
echo
" [CREATE]
$@
"
$(SRC_PATH_BARE)
/build/make/gen_msvs_sln.sh
\
$(
if
$(
filter
%vpx.vcproj,
$^
)
,
\
$(
foreach
vcp,
$(
filter-out
%vpx.vcproj %gtest.vcproj %obj_int_extract.vcproj,
$^
)
,
\
--dep
=
$(vcp:.vcproj=)
:vpx
)
\
$(
foreach
vcp,
$(
filter
%_test.vcproj,
$^
)
,
\
--dep
=
$(vcp:.vcproj=)
:gtest
))
\
--dep
=
vpx:obj_int_extract
\
--ver
=
$(CONFIG_VS_VERSION)
\
--out
=
$@
$^
$(
if
$(
filter
vpx.vcproj,
$^
)
,
$(VPX_RDEPS)
)
\
--dep
=
vpx:obj_int_extract
\
--dep
=
test_libvpx:gtest
\
--ver
=
$(CONFIG_VS_VERSION)
\
--out
=
$@
$^
vpx.sln.mk
:
vpx.sln
@
true
...
...
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