|
From: <md...@us...> - 2007-08-01 14:22:17
|
Revision: 3656
http://matplotlib.svn.sourceforge.net/matplotlib/?rev=3656&view=rev
Author: mdboom
Date: 2007-08-01 07:22:16 -0700 (Wed, 01 Aug 2007)
Log Message:
-----------
Fix order of libraries between freetype2 and zlib
Modified Paths:
--------------
trunk/matplotlib/setupext.py
Modified: trunk/matplotlib/setupext.py
===================================================================
--- trunk/matplotlib/setupext.py 2007-08-01 14:08:44 UTC (rev 3655)
+++ trunk/matplotlib/setupext.py 2007-08-01 14:22:16 UTC (rev 3656)
@@ -357,9 +357,6 @@
def add_ft2font_flags(module):
'Add the module flags to ft2font extension'
- module.libraries.append('z')
- add_base_flags(module)
-
if not get_pkgconfig(module, 'freetype2'):
module.libraries.append('freetype')
@@ -376,6 +373,9 @@
p = os.path.join(d, 'freetype2/lib')
if os.path.exists(p): module.library_dirs.append(p)
+ module.libraries.append('z')
+ add_base_flags(module)
+
if sys.platform == 'win32' and win32_compiler == 'mingw32':
module.libraries.append('gw32c')
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|