From a789c58bf36dd18274b9550a94d3e72d3e19ac18 Mon Sep 17 00:00:00 2001
From: wiredfool <eric-github@soroos.net>
Date: Thu, 18 Jun 2015 21:43:11 -0700
Subject: [PATCH] working webp build for both x86 and x64

---
 winbuild/build_dep.py | 2 +-
 winbuild/config.py    | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/winbuild/build_dep.py b/winbuild/build_dep.py
index 55a09c995..48927e4ea 100644
--- a/winbuild/build_dep.py
+++ b/winbuild/build_dep.py
@@ -185,7 +185,7 @@ setlocal
 cd /D %%WEBP%%
 rd /S /Q %%WEBP%%\output\release-static
 nmake -f Makefile.vc CFG=release-static RTLIBCFG=static OBJDIR=output all
-copy /Y /B output\release-static\%(platform)s\lib\* %%INCLIB%%
+copy /Y /B output\release-static\%(webp_platform)s\lib\* %%INCLIB%%
 mkdir %%INCLIB%%\webp
 copy /Y /B src\webp\*.h %%INCLIB%%\\webp
 endlocal
diff --git a/winbuild/config.py b/winbuild/config.py
index 73cab99ae..4cc68e49e 100644
--- a/winbuild/config.py
+++ b/winbuild/config.py
@@ -72,14 +72,16 @@ compilers = { (7,64): {
     'vc_version':'2008',
     'env_flags': '/x64 /xp',
     'inc_dir': 'msvcr90-x64',
-    'platform': 'x64'
+    'platform': 'x64',
+    'webp_platform': 'x64',
     },
              (7,32): {
     'env_version':'v7.0',
     'vc_version':'2008',
     'env_flags': '/x86 /xp',
     'inc_dir': 'msvcr90-x32',
-    'platform': 'Win32'
+    'platform': 'Win32',
+    'webp_platform': 'x86',
    },
 
              (7.1,64): {
@@ -88,6 +90,7 @@ compilers = { (7,64): {
     'env_flags': '/x64 /vista',
     'inc_dir': 'msvcr10-x64',
     'platform': 'x64',
+    'webp_platform': 'x64',
    },
              (7.1,32): {
     'env_version':'v7.1',
@@ -95,6 +98,7 @@ compilers = { (7,64): {
     'env_flags': '/x86 /vista',
     'inc_dir': 'msvcr10-x32',
     'platform': 'Win32',
+    'webp_platform': 'x86',
     },
 
     }