History

Merge "libs.mk,msvc: add missing vp9rc project"

James Zern committed 6 years ago

Commit c36a4d82 parents b130f71 36187e61 file · +52 −20Browse files

Unified · Split

libs.mk+52−20
@@ -91,6 +91,13 @@ ifeq ($(CONFIG_VP9_ENCODER),yes) · 90 unmodified lines
91 INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP9_PREFIX)/%91 INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/$(VP9_PREFIX)/%
92 CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8cx.h92 CODEC_DOC_SRCS += vpx/vp8.h vpx/vp8cx.h
93 CODEC_DOC_SECTIONS += vp9 vp9_encoder93 CODEC_DOC_SECTIONS += vp9 vp9_encoder
94
95 RC_RTC_SRCS := $(addprefix $(VP9_PREFIX),$(call enabled,VP9_CX_SRCS))
96 RC_RTC_SRCS += $(VP9_PREFIX)vp9cx.mk vpx/vp8.h vpx/vp8cx.h
97 RC_RTC_SRCS += $(VP9_PREFIX)ratectrl_rtc.cc
98 RC_RTC_SRCS += $(VP9_PREFIX)ratectrl_rtc.h
99 INSTALL-SRCS-$(CONFIG_CODEC_SRCS) += $(VP9_PREFIX)ratectrl_rtc.cc
100 INSTALL-SRCS-$(CONFIG_CODEC_SRCS) += $(VP9_PREFIX)ratectrl_rtc.h
94endif101endif
95 102
96ifeq ($(CONFIG_VP9_DECODER),yes)103ifeq ($(CONFIG_VP9_DECODER),yes)
@@ -115,6 +122,7 @@ endif · 18 unmodified lines
115ifeq ($(CONFIG_MSVS),yes)122ifeq ($(CONFIG_MSVS),yes)
116CODEC_LIB=$(if $(CONFIG_STATIC_MSVCRT),vpxmt,vpxmd)123CODEC_LIB=$(if $(CONFIG_STATIC_MSVCRT),vpxmt,vpxmd)
117GTEST_LIB=$(if $(CONFIG_STATIC_MSVCRT),gtestmt,gtestmd)124GTEST_LIB=$(if $(CONFIG_STATIC_MSVCRT),gtestmt,gtestmd)
125RC_RTC_LIB=$(if $(CONFIG_STATIC_MSVCRT),vp9rcmt,vp9rcmd)
118# This variable uses deferred expansion intentionally, since the results of126# This variable uses deferred expansion intentionally, since the results of
119# $(wildcard) may change during the course of the Make.127# $(wildcard) may change during the course of the Make.
120VS_PLATFORMS = $(foreach d,$(wildcard */Release/$(CODEC_LIB).lib),$(word 1,$(subst /, ,$(d))))128VS_PLATFORMS = $(foreach d,$(wildcard */Release/$(CODEC_LIB).lib),$(word 1,$(subst /, ,$(d))))
@@ -225,6 +233,36 @@ PROJECTS-yes += vpx.$(VCPROJ_SFX) · 104 unmodified lines
225vpx.$(VCPROJ_SFX): vpx_config.asm233vpx.$(VCPROJ_SFX): vpx_config.asm
226vpx.$(VCPROJ_SFX): $(RTCD)234vpx.$(VCPROJ_SFX): $(RTCD)
227 235
236vp9rc.$(VCPROJ_SFX): \
237 VCPROJ_SRCS=$(filter-out $(addprefix %, $(ASM_INCLUDES)), $^)
238
239vp9rc.$(VCPROJ_SFX): $(RC_RTC_SRCS)
240 @echo " [CREATE] $@"
241 $(qexec)$(GEN_VCPROJ) \
242 $(if $(CONFIG_SHARED),--dll,--lib) \
243 --target=$(TOOLCHAIN) \
244 $(if $(CONFIG_STATIC_MSVCRT),--static-crt) \
245 --name=vp9rc \
246 --proj-guid=C26FF952-9494-4838-9A3F-7F3D4F613385 \
247 --ver=$(CONFIG_VS_VERSION) \
248 --src-path-bare="$(SRC_PATH_BARE)" \
249 --out=$@ $(CFLAGS) \
250 $(filter $(SRC_PATH_BARE)/vp9/%.c, $(VCPROJ_SRCS)) \
251 $(filter $(SRC_PATH_BARE)/vp9/%.cc, $(VCPROJ_SRCS)) \
252 $(filter $(SRC_PATH_BARE)/vp9/%.h, $(VCPROJ_SRCS)) \
253 $(filter $(SRC_PATH_BARE)/vpx/%, $(VCPROJ_SRCS)) \
254 $(filter $(SRC_PATH_BARE)/vpx_dsp/%, $(VCPROJ_SRCS)) \
255 $(filter-out $(addprefix $(SRC_PATH_BARE)/, \
256 vp8/%.c vp8/%.h vp9/%.c vp9/%.cc vp9/%.h vpx/% \
257 vpx_dsp/%), \
258 $(VCPROJ_SRCS)) \
259 --src-path-bare="$(SRC_PATH_BARE)" \
260
261PROJECTS-yes += vp9rc.$(VCPROJ_SFX)
262
263vp9rc.$(VCPROJ_SFX): vpx_config.asm
264vp9rc.$(VCPROJ_SFX): $(RTCD)
265
228endif266endif
229else267else
230LIBVPX_OBJS=$(call objs, $(filter-out $(ASM_INCLUDES), $(CODEC_SRCS)))268LIBVPX_OBJS=$(call objs, $(filter-out $(ASM_INCLUDES), $(CODEC_SRCS)))
@@ -330,6 +368,15 @@ endif · 99 unmodified lines
330INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc368INSTALL-LIBS-yes += $(LIBSUBDIR)/pkgconfig/vpx.pc
331INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc369INSTALL_MAPS += $(LIBSUBDIR)/pkgconfig/%.pc %.pc
332CLEAN-OBJS += vpx.pc370CLEAN-OBJS += vpx.pc
371
372ifeq ($(CONFIG_VP9_ENCODER),yes)
373 RC_RTC_OBJS=$(call objs,$(RC_RTC_SRCS))
374 RC_RTC_OBJS=$(call objs,$(RC_RTC_SRCS))
375 OBJS-yes += $(RC_RTC_OBJS)
376 LIBS-yes += $(BUILD_PFX)libvp9rc.a $(BUILD_PFX)libvp9rc_g.a
377 $(BUILD_PFX)libvp9rc_g.a: $(RC_RTC_OBJS)
378endif
379
333endif380endif
334 381
335libvpx.ver: $(call enabled,CODEC_EXPORTS)382libvpx.ver: $(call enabled,CODEC_EXPORTS)
@@ -493,21 +540,21 @@ endif # TEST_INTRA_PRED_SPEED · 157 unmodified lines
493 540
494ifneq ($(strip $(RC_INTERFACE_TEST_OBJS)),)541ifneq ($(strip $(RC_INTERFACE_TEST_OBJS)),)
495PROJECTS-$(CONFIG_MSVS) += test_rc_interface.$(VCPROJ_SFX)542PROJECTS-$(CONFIG_MSVS) += test_rc_interface.$(VCPROJ_SFX)
496test_rc_interface.$(VCPROJ_SFX): \543test_rc_interface.$(VCPROJ_SFX): $(RC_INTERFACE_TEST_SRCS) vpx.$(VCPROJ_SFX) \
497 $(RC_INTERFACE_TEST_SRCS) vpx.$(VCPROJ_SFX) gtest.$(VCPROJ_SFX)544 vp9rc.$(VCPROJ_SFX) gtest.$(VCPROJ_SFX)
498 @echo " [CREATE] $@"545 @echo " [CREATE] $@"
499 $(qexec)$(GEN_VCPROJ) \546 $(qexec)$(GEN_VCPROJ) \
500 --exe \547 --exe \
501 --target=$(TOOLCHAIN) \548 --target=$(TOOLCHAIN) \
502 --name=test_rc_interface \549 --name=test_rc_interface \
503 -D_VARIADIC_MAX=10 \550 -D_VARIADIC_MAX=10 \
504 --proj-guid=CD837F5F-52D8-4314-A370-895D614166A7 \551 --proj-guid=30458F88-1BC6-4689-B41C-50F3737AAB27 \
505 --ver=$(CONFIG_VS_VERSION) \552 --ver=$(CONFIG_VS_VERSION) \
506 --src-path-bare="$(SRC_PATH_BARE)" \553 --src-path-bare="$(SRC_PATH_BARE)" \
507 $(if $(CONFIG_STATIC_MSVCRT),--static-crt) \554 $(if $(CONFIG_STATIC_MSVCRT),--static-crt) \
508 --out=$@ $(INTERNAL_CFLAGS) $(CFLAGS) \555 --out=$@ $(INTERNAL_CFLAGS) $(CFLAGS) \
509 -I.-I"$(SRC_PATH_BARE)/third_party/googletest/src/include" \556 -I. -I"$(SRC_PATH_BARE)/third_party/googletest/src/include" \
510 -L. -l$(CODEC_LIB) -l$(GTEST_LIB) -lvp9rc$^557 -L. -l$(CODEC_LIB) -l$(RC_RTC_LIB) -l$(GTEST_LIB) $^
511endif # RC_INTERFACE_TEST558endif # RC_INTERFACE_TEST
512endif559endif
513else560else
@@ -526,21 +573,6 @@ OBJS-yes += $(GTEST_OBJS) · 12 unmodified lines
526LIBS-yes += $(BUILD_PFX)libgtest.a $(BUILD_PFX)libgtest_g.a573LIBS-yes += $(BUILD_PFX)libgtest.a $(BUILD_PFX)libgtest_g.a
527$(BUILD_PFX)libgtest_g.a: $(GTEST_OBJS)574$(BUILD_PFX)libgtest_g.a: $(GTEST_OBJS)
528 575
529ifeq ($(CONFIG_VP9_ENCODER),yes)
530 VP9_PREFIX=vp9/
531 include $(SRC_PATH_BARE)/$(VP9_PREFIX)vp9cx.mk
532 RC_RTC_SRCS := $(addprefix $(VP9_PREFIX),$(call enabled,VP9_CX_SRCS))
533 RC_RTC_SRCS += $(VP9_PREFIX)vp9cx.mk vpx/vp8.h vpx/vp8cx.h
534 RC_RTC_SRCS += $(VP9_PREFIX)ratectrl_rtc.cc
535 RC_RTC_SRCS += $(VP9_PREFIX)ratectrl_rtc.h
536 VP9_CX_SRCS-$(CONFIG_VP9_ENCODER) += ratectrl_rtc.cc
537 VP9_CX_SRCS-$(CONFIG_VP9_ENCODER) += ratectrl_rtc.h
538 RC_RTC_OBJS=$(call objs,$(RC_RTC_SRCS))
539 OBJS-yes += $(RC_RTC_OBJS)
540 LIBS-yes += $(BUILD_PFX)libvp9rc.a $(BUILD_PFX)libvp9rc_g.a
541 $(BUILD_PFX)libvp9rc_g.a: $(RC_RTC_OBJS)
542endif
543
544LIBVPX_TEST_OBJS=$(sort $(call objs,$(LIBVPX_TEST_SRCS)))576LIBVPX_TEST_OBJS=$(sort $(call objs,$(LIBVPX_TEST_SRCS)))
545$(LIBVPX_TEST_OBJS) $(LIBVPX_TEST_OBJS:.o=.d): CXXFLAGS += $(GTEST_INCLUDES)577$(LIBVPX_TEST_OBJS) $(LIBVPX_TEST_OBJS:.o=.d): CXXFLAGS += $(GTEST_INCLUDES)
546OBJS-yes += $(LIBVPX_TEST_OBJS)578OBJS-yes += $(LIBVPX_TEST_OBJS)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t