Enable 64-bit builds on Windows
Encountered compile errors passing 64-bit size_t to
SkIntToScalar and needed to make adjustments to
gm/gradients.cpp and bench/PicturePlaybackBench.cpp.
Verified on my local Linux, Mac, and Windows machines.
As of this change, the skia_arch_width gyp define
actually forces a 32/64-bit build on Linux, Mac, and
Windows.
Review URL: https://codereview.appspot.com/6460112
git-svn-id: http://skia.googlecode.com/svn/trunk@5195 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/bench/PicturePlaybackBench.cpp b/bench/PicturePlaybackBench.cpp
index ebb5424..7cdbccf 100644
--- a/bench/PicturePlaybackBench.cpp
+++ b/bench/PicturePlaybackBench.cpp
@@ -119,7 +119,7 @@
if (fDrawPosH)
pos[i].set(x + advX, y);
else
- pos[i].set(x + advX, y + SkIntToScalar(i));
+ pos[i].set(x + advX, y + i);
advX += adv[i];
}
diff --git a/gm/gradients.cpp b/gm/gradients.cpp
index 775c796..8e8bb13 100644
--- a/gm/gradients.cpp
+++ b/gm/gradients.cpp
@@ -169,9 +169,9 @@
// apply an increasing y perspective as we move to the right
SkMatrix perspective;
perspective.setIdentity();
- perspective.setPerspY(SkScalarDiv(SkIntToScalar(i+1),
+ perspective.setPerspY(SkScalarDiv(SkIntToScalar((unsigned) i+1),
SkIntToScalar(500)));
- perspective.setSkewX(SkScalarDiv(SkIntToScalar(i+1),
+ perspective.setSkewX(SkScalarDiv(SkIntToScalar((unsigned) i+1),
SkIntToScalar(10)));
shader->setLocalMatrix(perspective);
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index eff47bf..b9fa429 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -85,6 +85,14 @@
},
},
},
+ 'conditions' : [
+ ['skia_arch_width == 64', {
+ 'msvs_configuration_platform': 'x64'
+ }],
+ ['skia_arch_width == 32', {
+ 'msvs_configuration_platform': 'Win32',
+ }],
+ ],
},
],