Simplify v8.gyp.

Based on http://codereview.chromium.org/10310156

BUG=
TEST=

Review URL: https://chromiumcodereview.appspot.com/10398057

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@11586 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

src/d8.cc

@@ -26,7 +26,8 @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
-#ifdef USING_V8_SHARED  // Defined when linking against shared lib on Windows.
+// Defined when linking against shared lib on Windows.
+#if defined(USING_V8_SHARED) && !defined(V8_SHARED)
 #define V8_SHARED
 #endif
 

tools/gyp/v8.gyp

@@ -58,29 +58,20 @@
                 # has some sources to link into the component.
                 '../../src/v8dll-main.cc',
               ],
-              'conditions': [
-                ['OS=="mac"', {
-                  'xcode_settings': {
-                    'OTHER_LDFLAGS': ['-dynamiclib', '-all_load']
-                  },
-                }],
-                ['OS=="win"', {
               'defines': [
+                'V8_SHARED',
                 'BUILDING_V8_SHARED',
               ],
               'direct_dependent_settings': {
                 'defines': [
+                  'V8_SHARED',
                   'USING_V8_SHARED',
                 ],
               },
-                }, {
-                  'defines': [
-                    'V8_SHARED',
-                  ],
-                  'direct_dependent_settings': {
-                    'defines': [
-                      'V8_SHARED',
-                    ],
+              'conditions': [
+                ['OS=="mac"', {
+                  'xcode_settings': {
+                    'OTHER_LDFLAGS': ['-dynamiclib', '-all_load']
                   },
                 }],
                 ['soname_version!=""', {
@@ -110,29 +101,18 @@
               'dependencies': ['mksnapshot', 'js2c'],
             }],
             ['component=="shared_library"', {
-              'conditions': [
-                ['OS=="win"', {
-                  'defines': [
-                    'BUILDING_V8_SHARED',
-                  ],
-                  'direct_dependent_settings': {
-                    'defines': [
-                      'USING_V8_SHARED',
-                    ],
-                  },
-                }, {
               'defines': [
                 'V8_SHARED',
+                'BUILDING_V8_SHARED',
               ],
               'direct_dependent_settings': {
                 'defines': [
                   'V8_SHARED',
+                  'USING_V8_SHARED',
                 ],
               },
             }],
           ],
-            }],
-          ],
           'dependencies': [
             'v8_base',
           ],