Merge pull request #137 from stonebig/master

stonebig · stonebig · commit 34a37be41880 · 2015-07-28T00:09:19.000+02:00
mingwpy compatibility
diff --git a/make.py b/make.py
@@ -680,6 +680,10 @@ def _create_batch_scripts(self):
 IF "%WINPYXX%"=="27" set WINPYSPEC=specs90
 
 cd %WINPYDIR%
+
+if not exist ..\tools\mingw32 echo no_mingw_in_tools
+if not exist ..\tools\mingw32 goto no_mingw_in_tools
+
 copy  /Y ..\tools\mingw32\%BASEMINGW%\lib\%WINPYMSVCR%  libs\%WINPYMSVCR%
 
 REM copy the right version of gcc
@@ -695,6 +699,9 @@ def _create_batch_scripts(self):
 ..\tools\mingw32\bin\dlltool -D python%WINPYXX%.dll -d python%WINPYXX%.def -l libpython%WINPYXX%.dll.a
 move /Y libpython%WINPYXX%.dll.a libs
 del python%WINPYXX%.def
+
+:no_mingw_in_tools
+
 """
 
         self.create_batch_script('Find_And_replace.vbs', r"""
diff --git a/winpython/data/packages.ini b/winpython/data/packages.ini
@@ -240,6 +240,10 @@ description=Implements a XML/HTML/XHTML Markup safe string for Python
 [matplotlib]
 description=2D plotting library (embeddable in GUIs created with PyQt)
 
+[mingwpy]
+description=the python friendly windows compiler toolchain
+url=https://anaconda.org/carlkl/mingwpy   
+
 [mistune]
 description=The fastest markdown parser in pure Python, inspired by marked.
 
