From a23ec527afe7b64445be083e9f77f12b15b77f51 Mon Sep 17 00:00:00 2001 From: James Zern Date: Tue, 29 Jun 2010 12:02:19 -0400 Subject: [PATCH] ARM WinCE VS8 build update The generated project is vpx.vcproj, change vpx_decoder references to match. Remove .rules file dependency as it will be pulled from the source tree. Change-Id: I679db2748b37adae3bafd764dba8575fc3abde72 --- build/arm-wince-vs8/{vpx_decoder.sln => vpx.sln} | 2 +- build/make/gen_msvs_proj.sh | 10 +++++----- libs.mk | 1 - 3 files changed, 6 insertions(+), 7 deletions(-) rename build/arm-wince-vs8/{vpx_decoder.sln => vpx.sln} (98%) diff --git a/build/arm-wince-vs8/vpx_decoder.sln b/build/arm-wince-vs8/vpx.sln similarity index 98% rename from build/arm-wince-vs8/vpx_decoder.sln rename to build/arm-wince-vs8/vpx.sln index 2262057..3e49929 100644 --- a/build/arm-wince-vs8/vpx_decoder.sln +++ b/build/arm-wince-vs8/vpx.sln @@ -8,7 +8,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "example", "example.vcproj", EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "obj_int_extract", "obj_int_extract.vcproj", "{E1360C65-D375-4335-8057-7ED99CC3F9B2}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vpx_decoder", "vpx_decoder.vcproj", "{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "vpx", "vpx.vcproj", "{DCE19DAF-69AC-46DB-B14A-39F0FAA5DB74}" ProjectSection(ProjectDependencies) = postProject {E1360C65-D375-4335-8057-7ED99CC3F9B2} = {E1360C65-D375-4335-8057-7ED99CC3F9B2} EndProjectSection diff --git a/build/make/gen_msvs_proj.sh b/build/make/gen_msvs_proj.sh index 7dd0ad1..63d5376 100755 --- a/build/make/gen_msvs_proj.sh +++ b/build/make/gen_msvs_proj.sh @@ -347,7 +347,7 @@ generate_vcproj() { x86*) $uses_asm && tag ToolFile RelativePath="$self_dirname/../x86-msvs/yasm.rules" ;; arm*|iwmmx*) - if [ "$name" == "vpx_decoder" ];then + if [ "$name" == "vpx" ];then case "$target" in armv5*) tag ToolFile RelativePath="$self_dirname/../arm-wince-vs8/armasmv5.rules" @@ -376,7 +376,7 @@ generate_vcproj() { if [ "$target" == "armv6-wince-vs8" ] || [ "$target" == "armv5te-wince-vs8" ] || [ "$target" == "iwmmxt-wince-vs8" ] || [ "$target" == "iwmmxt2-wince-vs8" ];then case "$name" in - vpx_decoder) tag Tool \ + vpx) tag Tool \ Name="VCPreBuildEventTool" \ CommandLine="call obj_int_extract.bat \$(ConfigurationName)" tag Tool \ @@ -510,7 +510,7 @@ generate_vcproj() { if [ "$target" == "armv6-wince-vs8" ] || [ "$target" == "armv5te-wince-vs8" ] || [ "$target" == "iwmmxt-wince-vs8" ] || [ "$target" == "iwmmxt2-wince-vs8" ];then case "$name" in - vpx_decoder) tag DeploymentTool \ + vpx) tag DeploymentTool \ ForceDirty="-1" \ RegisterOutput="0" ;; @@ -534,7 +534,7 @@ generate_vcproj() { if [ "$target" == "armv6-wince-vs8" ] || [ "$target" == "armv5te-wince-vs8" ] || [ "$target" == "iwmmxt-wince-vs8" ] || [ "$target" == "iwmmxt2-wince-vs8" ];then case "$name" in - vpx_decoder) tag Tool \ + vpx) tag Tool \ Name="VCPreBuildEventTool" \ CommandLine="call obj_int_extract.bat \$(ConfigurationName)" tag Tool \ @@ -672,7 +672,7 @@ generate_vcproj() { if [ "$target" == "armv6-wince-vs8" ] || [ "$target" == "armv5te-wince-vs8" ] || [ "$target" == "iwmmxt-wince-vs8" ] || [ "$target" == "iwmmxt2-wince-vs8" ];then case "$name" in - vpx_decoder) tag DeploymentTool \ + vpx) tag DeploymentTool \ ForceDirty="-1" \ RegisterOutput="0" ;; diff --git a/libs.mk b/libs.mk index 21c25c0..4bc5dd7 100644 --- a/libs.mk +++ b/libs.mk @@ -144,7 +144,6 @@ obj_int_extract.vcproj: $(SRC_PATH_BARE)/build/make/obj_int_extract.c PROJECTS-$(BUILD_LIBVPX) += obj_int_extract.vcproj PROJECTS-$(BUILD_LIBVPX) += obj_int_extract.bat -PROJECTS-$(BUILD_LIBVPX) += armasm$(ARM_ARCH).rules endif vpx.def: $(call enabled,CODEC_EXPORTS) -- 2.7.4