deps/libffi: Added static Win32 libffi.a since it requires MSYS to build; Updated...

diff --git a/.gitignore b/.gitignore
index 38471a4..bb0cecf 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,9 @@ dat/
 *.o
 *.so
 *.a
+*.la
+*.lo
+*.lai
 *.lib
 
 # Packages

diff --git a/deps/Makefile b/deps/Makefile
index 4ca3d50..a70db97 100644 (file)
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -1,4 +1,4 @@
-.PHONY: freetype jpeg png gif z clean realclean distclean
+.PHONY: freetype jpeg png gif z ffi clean realclean distclean
 .SILENT:
 
 # CROSS-PLATFORM MAGIC
@@ -6,7 +6,12 @@
 include ../include.mk
 
 ifdef WINDOWS
+ifdef MSYSCON
+# Need MSYS to build libffi
+all: freetype jpeg png gif ffi z
+else
 all: freetype jpeg png gif z
+endif
 else
 ifdef OSX
 all: jpeg png gif
@@ -21,6 +26,9 @@ clean:
        cd zlib && $(MAKE) clean
        cd jpeg-6b && $(MAKE) clean
        cd libungif-4.1.1 && $(MAKE) clean
+ifdef MSYSCON
+       cd libffi-3.0.11 && $(MAKE) clean
+endif
 
 realclean:
        cd freetype-2.3.12 && $(MAKE) realclean
@@ -56,4 +64,6 @@ z:
        @$(call echo,Building zlib...)
        cd zlib && $(MAKE)
 
-
+ffi:
+       @$(call echo,Building libffi...)
+       cd libffi-3.0.11 && $(MAKE)

diff --git a/deps/libffi-3.0.11/i686-pc-mingw32/.libs/libffi.a b/deps/libffi-3.0.11/i686-pc-mingw32/.libs/libffi.a
new file mode 100644 (file)
index 0000000..072ed84
Binary files /dev/null and b/deps/libffi-3.0.11/i686-pc-mingw32/.libs/libffi.a differ