From: Tom Finegan <tomfinegan@google.com>
Date: Thu, 20 Feb 2014 22:51:05 +0000 (-0800)
Subject: gen_msvs_vcxproj.sh: Set TargetName instead of OutputFile.
X-Git-Tag: v1.4.0~2287^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7f17b2e476f8807811cf9e74c40ee3177a73cc32;p=libvpx

gen_msvs_vcxproj.sh: Set TargetName instead of OutputFile.

Set TargetName for library builds instead of changing the value of
OutputFile.

This fixes the following warnings:
warning MSB8012: TargetPath does not match Library's OutputFile property
value.

Change-Id: I4320b6d9ea922d3a15b9823c7c6694ee33edbf45
---

diff --git a/build/make/gen_msvs_vcxproj.sh b/build/make/gen_msvs_vcxproj.sh
index a6315b9ee..098d707f8 100755
--- a/build/make/gen_msvs_vcxproj.sh
+++ b/build/make/gen_msvs_vcxproj.sh
@@ -430,6 +430,14 @@ generate_vcxproj() {
                 Condition="'\$(Configuration)|\$(Platform)'=='$config|$plat'"
             tag_content OutDir "\$(SolutionDir)$plat_no_ws\\\$(Configuration)\\"
             tag_content IntDir "$plat_no_ws\\\$(Configuration)\\${name}\\"
+            if [ "$proj_kind" == "lib" ]; then
+              if [ "$config" == "Debug" ]; then
+                config_suffix=d
+              else
+                config_suffix=""
+              fi
+              tag_content TargetName "${name}${lib_sfx}${config_suffix}"
+            fi
             close_tag PropertyGroup
         done
     done
@@ -448,7 +456,6 @@ generate_vcxproj() {
                 opt=Disabled
                 runtime=$debug_runtime
                 curlibs=$debug_libs
-                confsuffix=d
                 case "$name" in
                 obj_int_extract)
                     debug=DEBUG
@@ -461,7 +468,6 @@ generate_vcxproj() {
                 opt=MaxSpeed
                 runtime=$release_runtime
                 curlibs=$libs
-                confsuffix=""
                 tag_content FavorSizeOrSpeed Speed
                 debug=NDEBUG
             fi
@@ -499,9 +505,6 @@ generate_vcxproj() {
                 close_tag Link
                 ;;
             lib)
-                open_tag Lib
-                tag_content OutputFile "\$(OutDir)${name}${lib_sfx}${confsuffix}.lib"
-                close_tag Lib
                 ;;
             esac
             close_tag ItemDefinitionGroup