X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=solution.mk;h=2de1d8d3e292b6532319c9b27c5e8fdf3c848a69;hb=f4126995b791833836830ee6da71fc4fba578fe0;hp=6d2c08d060c6692a4adafc70531f1d7d5f5b325a;hpb=4d1b0d2a2dff335baedd52bd7de09d55ec10b253;p=profile%2Fivi%2Flibvpx.git diff --git a/solution.mk b/solution.mk index 6d2c08d..2de1d8d 100644 --- a/solution.mk +++ b/solution.mk @@ -9,46 +9,22 @@ ## -ifeq ($(ARCH_ARM),yes) -ARM_DEVELOP=no -ARM_DEVELOP:=$(if $(filter %vpx.vcproj,$(wildcard *.vcproj)),yes) - -ifeq ($(ARM_DEVELOP),yes) -vpx.sln: - @echo " [COPY] $@" - @cp $(SRC_PATH_BARE)/build/arm-wince-vs8/vpx.sln . -PROJECTS-yes += vpx.sln -else -vpx.sln: $(wildcard *.vcproj) - @echo " [CREATE] $@" - $(SRC_PATH_BARE)/build/make/gen_msvs_sln.sh \ - $(if $(filter %vpx.vcproj,$^),--dep=vpxdec:vpx) \ - $(if $(filter %vpx.vcproj,$^),--dep=xma:vpx) \ - --ver=$(CONFIG_VS_VERSION)\ - --target=$(TOOLCHAIN)\ - --out=$@ $^ -vpx.sln.mk: vpx.sln - @true - -PROJECTS-yes += vpx.sln vpx.sln.mk --include vpx.sln.mk -endif - -else 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,$^),\ - --dep=$(vcp:.vcproj=):vpx)) \ - --ver=$(CONFIG_VS_VERSION)\ - --out=$@ $^ + $(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=$@ $^ vpx.sln.mk: vpx.sln @true PROJECTS-yes += vpx.sln vpx.sln.mk -include vpx.sln.mk -endif # Always install this file, as it is an unconditional post-build rule. INSTALL_MAPS += src/% $(SRC_PATH_BARE)/%