fixup

Signed-off-by: Paolo Insogna <[email protected]>

Author: ShogunPanda

deps/libffi/libffi.gyp

@@ -107,7 +107,7 @@
       ],
       'include_dirs': [
         'include',
-        '<(INTERMEDIATE_DIR)',
+        '<(SHARED_INTERMEDIATE_DIR)/libffi',
       ],
       'sources': [
         '<@(libffi_sources)',
@@ -124,15 +124,15 @@
             'src/x86/ffitarget.h',
           ],
           'outputs': [
-            '<(INTERMEDIATE_DIR)/ffi.h',
-            '<(INTERMEDIATE_DIR)/fficonfig.h',
-            '<(INTERMEDIATE_DIR)/ffitarget.h',
+            '<(SHARED_INTERMEDIATE_DIR)/libffi/ffi.h',
+            '<(SHARED_INTERMEDIATE_DIR)/libffi/fficonfig.h',
+            '<(SHARED_INTERMEDIATE_DIR)/libffi/ffitarget.h',
           ],
           'action': [
             '<(python)',
             'generate-headers.py',
             '--output-dir',
-            '<(INTERMEDIATE_DIR)',
+            '<(SHARED_INTERMEDIATE_DIR)/libffi',
           ],
         },
       ],
@@ -213,7 +213,7 @@
       'direct_dependent_settings': {
         'include_dirs': [
           'include',
-          '<(INTERMEDIATE_DIR)',
+          '<(SHARED_INTERMEDIATE_DIR)/libffi',
         ],
         'defines': [
           'FFI_STATIC_BUILD',

node.gyp

@@ -1010,21 +1010,6 @@
               'dependencies': [
                 'deps/libffi/libffi.gyp:libffi',
               ],
-              'conditions': [
-                [ 'OS=="win"', {
-                  'include_dirs': [
-                    '<(PRODUCT_DIR)/obj/libffi',
-                  ],
-                }, 'OS=="mac"', {
-                  'include_dirs': [
-                    '<(PRODUCT_DIR)/obj/deps/libffi/libffi.gen',
-                  ],
-                }, {
-                  'include_dirs': [
-                    '<(PRODUCT_DIR)/obj.target/libffi/geni',
-                  ],
-                }],
-              ],
             }],
           ],
         }],
@@ -1092,21 +1077,6 @@
               'dependencies': [
                 'deps/libffi/libffi.gyp:libffi',
               ],
-              'conditions': [
-                [ 'OS=="win"', {
-                  'include_dirs': [
-                    '<(PRODUCT_DIR)/obj/libffi',
-                  ],
-                }, 'OS=="mac"', {
-                  'include_dirs': [
-                    '<(PRODUCT_DIR)/obj/deps/libffi/libffi.gen',
-                  ],
-                }, {
-                  'include_dirs': [
-                    '<(PRODUCT_DIR)/obj.target/libffi/geni',
-                  ],
-                }],
-              ],
             }],
           ],
         }],