Browse Source

Merge pull request #670 from Agamnentzar/fix-vs2015

Fix compilation on Visual Studio 2015
v1.x
Linus Unnebäck 9 years ago
parent
commit
9472317003
  1. 1
      binding.gyp
  2. 5
      src/color.cc
  3. 5
      src/init.cc

1
binding.gyp

@ -62,7 +62,6 @@
'<(GTK_Root)/include/cairo', '<(GTK_Root)/include/cairo',
], ],
'defines': [ 'defines': [
'snprintf=_snprintf',
'_USE_MATH_DEFINES' # for M_PI '_USE_MATH_DEFINES' # for M_PI
], ],
'configurations': { 'configurations': {

5
src/color.cc

@ -10,6 +10,11 @@
#include <cmath> #include <cmath>
#include <limits> #include <limits>
// Compatibility with Visual Studio versions prior to VS2015
#if defined(_MSC_VER) && _MSC_VER < 1900
#define snprintf _snprintf
#endif
/* /*
* Parse integer value * Parse integer value
*/ */

5
src/init.cc

@ -17,6 +17,11 @@
#include "FontFace.h" #include "FontFace.h"
#endif #endif
// Compatibility with Visual Studio versions prior to VS2015
#if defined(_MSC_VER) && _MSC_VER < 1900
#define snprintf _snprintf
#endif
NAN_MODULE_INIT(init) { NAN_MODULE_INIT(init) {
Canvas::Initialize(target); Canvas::Initialize(target);
Image::Initialize(target); Image::Initialize(target);

Loading…
Cancel
Save