OLD | NEW |
1 ## | 1 ## |
2 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved. | 2 ## Copyright (c) 2010 The WebM project authors. All Rights Reserved. |
3 ## | 3 ## |
4 ## Use of this source code is governed by a BSD-style license | 4 ## Use of this source code is governed by a BSD-style license |
5 ## that can be found in the LICENSE file in the root of the source | 5 ## that can be found in the LICENSE file in the root of the source |
6 ## tree. An additional intellectual property rights grant can be found | 6 ## tree. An additional intellectual property rights grant can be found |
7 ## in the file PATENTS. All contributing project authors may | 7 ## in the file PATENTS. All contributing project authors may |
8 ## be found in the AUTHORS file in the root of the source tree. | 8 ## be found in the AUTHORS file in the root of the source tree. |
9 ## | 9 ## |
10 | 10 |
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
42 endef | 42 endef |
43 endif # rvct | 43 endif # rvct |
44 endif # !gcc | 44 endif # !gcc |
45 | 45 |
46 # | 46 # |
47 # Rule to generate runtime cpu detection files | 47 # Rule to generate runtime cpu detection files |
48 # | 48 # |
49 define rtcd_h_template | 49 define rtcd_h_template |
50 $$(BUILD_PFX)$(1).h: $$(SRC_PATH_BARE)/$(2) | 50 $$(BUILD_PFX)$(1).h: $$(SRC_PATH_BARE)/$(2) |
51 @echo " [CREATE] $$@" | 51 @echo " [CREATE] $$@" |
52 » $$(qexec)$$(SRC_PATH_BARE)/build/make/rtcd.sh --arch=$$(TGT_ISA) \ | 52 » $$(qexec)$$(SRC_PATH_BARE)/build/make/rtcd.pl --arch=$$(TGT_ISA) \ |
53 --sym=$(1) \ | 53 --sym=$(1) \ |
54 --config=$$(CONFIG_DIR)$$(target)$$(if $$(FAT_ARCHS),,-$$(TOOLCHAIN)).
mk \ | 54 --config=$$(CONFIG_DIR)$$(target)$$(if $$(FAT_ARCHS),,-$$(TOOLCHAIN)).
mk \ |
55 $$(RTCD_OPTIONS) $$^ > $$@ | 55 $$(RTCD_OPTIONS) $$^ > $$@ |
56 CLEAN-OBJS += $$(BUILD_PFX)$(1).h | 56 CLEAN-OBJS += $$(BUILD_PFX)$(1).h |
57 RTCD += $$(BUILD_PFX)$(1).h | 57 RTCD += $$(BUILD_PFX)$(1).h |
58 endef | 58 endef |
59 | 59 |
60 CODEC_SRCS-yes += CHANGELOG | 60 CODEC_SRCS-yes += CHANGELOG |
61 CODEC_SRCS-yes += libs.mk | 61 CODEC_SRCS-yes += libs.mk |
62 | 62 |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/vpx/% | 155 INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/vpx/% |
156 INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/vpx_ports/% | 156 INSTALL_MAPS += include/vpx/% $(SRC_PATH_BARE)/vpx_ports/% |
157 INSTALL_MAPS += $(LIBSUBDIR)/% % | 157 INSTALL_MAPS += $(LIBSUBDIR)/% % |
158 INSTALL_MAPS += src/% $(SRC_PATH_BARE)/% | 158 INSTALL_MAPS += src/% $(SRC_PATH_BARE)/% |
159 ifeq ($(CONFIG_MSVS),yes) | 159 ifeq ($(CONFIG_MSVS),yes) |
160 INSTALL_MAPS += $(foreach p,$(VS_PLATFORMS),$(LIBSUBDIR)/$(p)/% $(p)/Release/%) | 160 INSTALL_MAPS += $(foreach p,$(VS_PLATFORMS),$(LIBSUBDIR)/$(p)/% $(p)/Release/%) |
161 INSTALL_MAPS += $(foreach p,$(VS_PLATFORMS),$(LIBSUBDIR)/$(p)/% $(p)/Debug/%) | 161 INSTALL_MAPS += $(foreach p,$(VS_PLATFORMS),$(LIBSUBDIR)/$(p)/% $(p)/Debug/%) |
162 endif | 162 endif |
163 | 163 |
164 CODEC_SRCS-$(BUILD_LIBVPX) += build/make/version.sh | 164 CODEC_SRCS-$(BUILD_LIBVPX) += build/make/version.sh |
165 CODEC_SRCS-$(BUILD_LIBVPX) += build/make/rtcd.sh | 165 CODEC_SRCS-$(BUILD_LIBVPX) += build/make/rtcd.pl |
166 CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/emmintrin_compat.h | 166 CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/emmintrin_compat.h |
167 CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/mem_ops.h | 167 CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/mem_ops.h |
168 CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/mem_ops_aligned.h | 168 CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/mem_ops_aligned.h |
169 CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/vpx_once.h | 169 CODEC_SRCS-$(BUILD_LIBVPX) += vpx_ports/vpx_once.h |
170 CODEC_SRCS-$(BUILD_LIBVPX) += $(BUILD_PFX)vpx_config.c | 170 CODEC_SRCS-$(BUILD_LIBVPX) += $(BUILD_PFX)vpx_config.c |
171 INSTALL-SRCS-no += $(BUILD_PFX)vpx_config.c | 171 INSTALL-SRCS-no += $(BUILD_PFX)vpx_config.c |
172 ifeq ($(ARCH_X86)$(ARCH_X86_64),yes) | 172 ifeq ($(ARCH_X86)$(ARCH_X86_64),yes) |
173 CODEC_SRCS-$(BUILD_LIBVPX) += third_party/x86inc/x86inc.asm | 173 CODEC_SRCS-$(BUILD_LIBVPX) += third_party/x86inc/x86inc.asm |
174 endif | 174 endif |
175 CODEC_EXPORTS-$(BUILD_LIBVPX) += vpx/exports_com | 175 CODEC_EXPORTS-$(BUILD_LIBVPX) += vpx/exports_com |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
229 | 229 |
230 PROJECTS-$(BUILD_LIBVPX) += obj_int_extract.$(VCPROJ_SFX) | 230 PROJECTS-$(BUILD_LIBVPX) += obj_int_extract.$(VCPROJ_SFX) |
231 | 231 |
232 vpx.def: $(call enabled,CODEC_EXPORTS) | 232 vpx.def: $(call enabled,CODEC_EXPORTS) |
233 @echo " [CREATE] $@" | 233 @echo " [CREATE] $@" |
234 $(qexec)$(SRC_PATH_BARE)/build/make/gen_msvs_def.sh\ | 234 $(qexec)$(SRC_PATH_BARE)/build/make/gen_msvs_def.sh\ |
235 --name=vpx\ | 235 --name=vpx\ |
236 --out=$@ $^ | 236 --out=$@ $^ |
237 CLEAN-OBJS += vpx.def | 237 CLEAN-OBJS += vpx.def |
238 | 238 |
| 239 # Assembly files that are included, but don't define symbols themselves. |
| 240 # Filtered out to avoid Visual Studio build warnings. |
| 241 ASM_INCLUDES := \ |
| 242 third_party/x86inc/x86inc.asm \ |
| 243 vpx_config.asm \ |
| 244 vpx_ports/x86_abi_support.asm \ |
| 245 |
239 vpx.$(VCPROJ_SFX): $(CODEC_SRCS) vpx.def obj_int_extract.$(VCPROJ_SFX) | 246 vpx.$(VCPROJ_SFX): $(CODEC_SRCS) vpx.def obj_int_extract.$(VCPROJ_SFX) |
240 @echo " [CREATE] $@" | 247 @echo " [CREATE] $@" |
241 $(qexec)$(GEN_VCPROJ) \ | 248 $(qexec)$(GEN_VCPROJ) \ |
242 $(if $(CONFIG_SHARED),--dll,--lib) \ | 249 $(if $(CONFIG_SHARED),--dll,--lib) \ |
243 --target=$(TOOLCHAIN) \ | 250 --target=$(TOOLCHAIN) \ |
244 $(if $(CONFIG_STATIC_MSVCRT),--static-crt) \ | 251 $(if $(CONFIG_STATIC_MSVCRT),--static-crt) \ |
245 --name=vpx \ | 252 --name=vpx \ |
246 --proj-guid=DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74 \ | 253 --proj-guid=DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74 \ |
247 --module-def=vpx.def \ | 254 --module-def=vpx.def \ |
248 --ver=$(CONFIG_VS_VERSION) \ | 255 --ver=$(CONFIG_VS_VERSION) \ |
249 --out=$@ $(CFLAGS) $^ \ | 256 --out=$@ $(CFLAGS) \ |
| 257 $(filter-out $(addprefix %, $(ASM_INCLUDES)), $^) \ |
250 --src-path-bare="$(SRC_PATH_BARE)" \ | 258 --src-path-bare="$(SRC_PATH_BARE)" \ |
251 | 259 |
252 PROJECTS-$(BUILD_LIBVPX) += vpx.$(VCPROJ_SFX) | 260 PROJECTS-$(BUILD_LIBVPX) += vpx.$(VCPROJ_SFX) |
253 | 261 |
254 vpx.$(VCPROJ_SFX): vpx_config.asm | 262 vpx.$(VCPROJ_SFX): vpx_config.asm |
255 vpx.$(VCPROJ_SFX): $(RTCD) | 263 vpx.$(VCPROJ_SFX): $(RTCD) |
256 | 264 |
257 endif | 265 endif |
258 else | 266 else |
259 LIBVPX_OBJS=$(call objs,$(CODEC_SRCS)) | 267 LIBVPX_OBJS=$(call objs,$(CODEC_SRCS)) |
(...skipping 256 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
516 @echo "INPUT += $^" >> $@ | 524 @echo "INPUT += $^" >> $@ |
517 @echo "PREDEFINED = VPX_CODEC_DISABLE_COMPAT" >> $@ | 525 @echo "PREDEFINED = VPX_CODEC_DISABLE_COMPAT" >> $@ |
518 @echo "INCLUDE_PATH += ." >> $@; | 526 @echo "INCLUDE_PATH += ." >> $@; |
519 @echo "ENABLED_SECTIONS += $(sort $(CODEC_DOC_SECTIONS))" >> $@ | 527 @echo "ENABLED_SECTIONS += $(sort $(CODEC_DOC_SECTIONS))" >> $@ |
520 | 528 |
521 ## Generate rtcd.h for all objects | 529 ## Generate rtcd.h for all objects |
522 $(OBJS-yes:.o=.d): $(RTCD) | 530 $(OBJS-yes:.o=.d): $(RTCD) |
523 | 531 |
524 ## Update the global src list | 532 ## Update the global src list |
525 SRCS += $(CODEC_SRCS) $(LIBVPX_TEST_SRCS) $(GTEST_SRCS) | 533 SRCS += $(CODEC_SRCS) $(LIBVPX_TEST_SRCS) $(GTEST_SRCS) |
OLD | NEW |