[Pkg-javascript-commits] [node-leveldown] 266/492: enable snappy, remove msvc compile warnings

[Andrew Kelley]

This is an automated email from the git hooks/post-receive script.

andrewrk-guest pushed a commit to annotated tag rocksdb-0.10.1
in repository node-leveldown.

commit f476f386fc146fd60596afa73470b5fc9c39f4f9
Author: Rod Vagg <rod at vagg.org>
Date:   Sun Mar 24 19:50:03 2013 +1100

    enable snappy, remove msvc compile warnings
---
 binding.gyp                                     | 15 +++++++++++++++
 deps/leveldb/leveldb-1.9.0/libuv_port/port_uv.h |  1 -
 deps/leveldb/leveldb.gyp                        |  4 +++-
 deps/snappy/snappy.gyp                          | 15 ++++++++++++++-
 4 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/binding.gyp b/binding.gyp
index 8f16109..fa528ff 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -1,6 +1,21 @@
 {
     "targets": [{
         "target_name": "leveldown"
+    , 'conditions': [
+          ['OS == "win"', {
+              'defines': [
+                  '_HAS_EXCEPTIONS=0'
+              ]
+            , 'msvs_settings': {
+                  'VCCLCompilerTool': {
+                      'RuntimeTypeInfo': 'false'
+                    , 'EnableFunctionLevelLinking': 'true'
+                    , 'ExceptionHandling': '2'
+                    , 'DisableSpecificWarnings': [ '4355', '4530' ,'4267', '4244', '4506' ]
+                  }
+              }
+           }]
+        ]
       , "dependencies": [
             "<(module_root_dir)/deps/leveldb/leveldb.gyp:leveldb"
         ]
diff --git a/deps/leveldb/leveldb-1.9.0/libuv_port/port_uv.h b/deps/leveldb/leveldb-1.9.0/libuv_port/port_uv.h
index bf99708..f63c4d5 100644
--- a/deps/leveldb/leveldb-1.9.0/libuv_port/port_uv.h
+++ b/deps/leveldb/leveldb-1.9.0/libuv_port/port_uv.h
@@ -31,7 +31,6 @@
   #define snprintf _snprintf
   #define close _close
   #define fread_unlocked _fread_nolock
-  #pragma warning(disable : 4355)
 #else
   #include <endian.h>
 #endif
diff --git a/deps/leveldb/leveldb.gyp b/deps/leveldb/leveldb.gyp
index e9776e8..7d8eef7 100644
--- a/deps/leveldb/leveldb.gyp
+++ b/deps/leveldb/leveldb.gyp
@@ -6,7 +6,7 @@
   , 'type': 'static_library'
 		# Overcomes an issue with the linker and thin .a files on SmartOS
   , 'standalone_static_library': 1
-  , 'xdependencies': [
+  , 'dependencies': [
         '../snappy/snappy.gyp:snappy'
     ]
   , 'direct_dependent_settings': {
@@ -33,6 +33,7 @@
             ]
           , 'defines': [
                 'NOMINMAX=1'
+              , '_HAS_EXCEPTIONS=0'
             ]
           , 'sources': [
                 'leveldb-<(ldbversion)/libuv_port/port_uv.cc'
@@ -44,6 +45,7 @@
                     'RuntimeTypeInfo': 'false'
                   , 'EnableFunctionLevelLinking': 'true'
                   , 'ExceptionHandling': '2'
+                  , 'DisableSpecificWarnings': [ '4355', '4530' ,'4267', '4244' ]
                 }
             }
         }, { # OS != "win"
diff --git a/deps/snappy/snappy.gyp b/deps/snappy/snappy.gyp
index 5770caa..09a09cd 100644
--- a/deps/snappy/snappy.gyp
+++ b/deps/snappy/snappy.gyp
@@ -22,7 +22,20 @@
         ]
     }
   , 'conditions': [
-        ['OS == "linux"', {
+        ['OS == "win"', {
+            'defines': [
+                '_HAS_EXCEPTIONS=0'
+            ]
+          , 'msvs_settings': {
+                'VCCLCompilerTool': {
+                    'RuntimeTypeInfo': 'false'
+                  , 'EnableFunctionLevelLinking': 'true'
+                  , 'ExceptionHandling': '2'
+                  , 'DisableSpecificWarnings': [ '4355', '4530' ,'4267', '4244', '4506', '4018' ]
+                }
+            }
+         }]
+      , ['OS == "linux"', {
             'cflags': [
                 '-Wno-sign-compare'
               , '-Wno-unused-function'

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/node-leveldown.git