deps/libffi: Tweaks to build 64 bit libffi on Windows

diff --git a/deps/libffi-3.0.11/ffi.epj b/deps/libffi-3.0.11/ffi.epj
index 1e72725..4084e4f 100644 (file)
--- a/deps/libffi-3.0.11/ffi.epj
+++ b/deps/libffi-3.0.11/ffi.epj
@@ -44,10 +44,17 @@
                   "win32.S"
                ]
             },
+            {
+               "Folder" : "x64",
+               "Files" : [
+                  "src/x86/win64.S"
+               ]
+            },
             "prep_cif.c",
             "raw_api.c",
             "types.c",
-            "closures.c"
+            "closures.c",
+            "i686-pc-mingw32/include/ffi.h"
          ]
       }
    ],

diff --git a/deps/libffi-3.0.11/i686-pc-mingw32/include/ffi.h b/deps/libffi-3.0.11/i686-pc-mingw32/include/ffi.h
index b424bc0..d1694f6 100644 (file)
--- a/deps/libffi-3.0.11/i686-pc-mingw32/include/ffi.h
+++ b/deps/libffi-3.0.11/i686-pc-mingw32/include/ffi.h
@@ -58,10 +58,20 @@ extern "C" {
 #endif
 
 /* Specify which architecture libffi is configured for. */
+#ifdef _W64
+
+#ifndef X86_WIN64
+#define X86_WIN64
+#endif
+
+#else
+
 #ifndef X86_WIN32
 #define X86_WIN32
 #endif
 
+#endif
+
 /* ---- System configuration information --------------------------------- */
 
 #include <ffitarget.h>