source/libvpx/build/make/gen_msvs_proj.sh - Issue 1302353004: libvpx: Pull from upstream

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: source/libvpx/build/make/gen_msvs_proj.sh

Issue 1302353004: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master

Patch Set: Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: source/libvpx/build/make/gen_msvs_proj.sh

diff --git a/source/libvpx/build/make/gen_msvs_proj.sh b/source/libvpx/build/make/gen_msvs_proj.sh

index dcce78255d4757be676dafd4d6dfee60dd0cd26c..0cf335b3d26f0dd1081c783ba9f588f3a1624c20 100755

--- a/source/libvpx/build/make/gen_msvs_proj.sh

+++ b/source/libvpx/build/make/gen_msvs_proj.sh

@@ -73,6 +73,10 @@ generate_filter() {

open_tag File RelativePath="$f"

if [ "$pat" == "asm" ] && $asm_use_custom_step; then

+ # Avoid object file name collisions, i.e. vpx_config.c and

+ # vpx_config.asm produce the same object file without

+ # this additional suffix.

+ objf=${objf%.obj}_asm.obj

for plat in "${platforms[@]}"; do

for cfg in Debug Release; do

open_tag FileConfiguration \

« no previous file with comments | « source/libvpx/build/make/configure.sh ('k') | source/libvpx/build/make/gen_msvs_sln.sh » ('j') | no next file with comments »