Fixed broken libffi Makefile on Win64; Auto selecting GCC_PREFIX for MinGW-w64

[sdk] / deps / Makefile

diff --git a/deps/Makefile b/deps/Makefile
index a70db97..29f0cd3 100644 (file)
--- a/deps/Makefile
+++ b/deps/Makefile
@@ -1,34 +1,36 @@
-.PHONY: freetype jpeg png gif z ffi clean realclean distclean
+.PHONY: freetype jpeg png gif z ffi cleantarget clean realclean distclean
 .SILENT:
 
 # CROSS-PLATFORM MAGIC
 
-include ../include.mk
+include ../crossplatform.mk
+include ../default.cf
 
-ifdef WINDOWS
-ifdef MSYSCON
-# Need MSYS to build libffi
+ifdef WINDOWS_TARGET
 all: freetype jpeg png gif ffi z
 else
-all: freetype jpeg png gif z
-endif
-else
-ifdef OSX
-all: jpeg png gif
+ifdef OSX_TARGET
+all: jpeg gif
 else
 all: gif
 endif
 endif
 
+cleantarget:
+       cd freetype-2.3.12 && $(MAKE) cleantarget
+       cd libpng-1.4.0 && $(MAKE) cleantarget
+       cd zlib && $(MAKE) cleantarget
+       cd jpeg-6b && $(MAKE) cleantarget
+       cd libungif-4.1.1 && $(MAKE) cleantarget
+       cd libffi-3.0.11 && $(MAKE) cleantarget
+
 clean:
        cd freetype-2.3.12 && $(MAKE) clean
        cd libpng-1.4.0 && $(MAKE) 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
@@ -36,6 +38,7 @@ realclean:
        cd zlib && $(MAKE) realclean
        cd jpeg-6b && $(MAKE) realclean
        cd libungif-4.1.1 && $(MAKE) realclean
+       cd libffi-3.0.11 && $(MAKE) realclean
 
 distclean:
        cd freetype-2.3.12 && $(MAKE) distclean
@@ -43,6 +46,7 @@ distclean:
        cd zlib && $(MAKE) distclean
        cd jpeg-6b && $(MAKE) distclean
        cd libungif-4.1.1 && $(MAKE) distclean
+       cd libffi-3.0.11 && $(MAKE) distclean
 
 freetype:
        @$(call echo,Building FreeType...)