65
65
BUILT_CONTOUR = False
66
66
BUILT_GDK = False
67
67
68
+ AGG_VERSION = 'agg23'
68
69
69
70
class CleanUpFile :
70
71
"""CleanUpFile deletes the specified filename when self is destroyed."""
@@ -110,7 +111,7 @@ def add_agg_flags(module):
110
111
module .libraries .append ('png' )
111
112
module .libraries .append ('z' )
112
113
add_base_flags (module )
113
- module .include_dirs .extend (['src' ,'agg22 /include' , '.' ])
114
+ module .include_dirs .extend (['src' ,'%s /include' % AGG_VERSION , '.' ])
114
115
115
116
# put these later for correct link order
116
117
module .libraries .extend (['stdc++' , 'm' ])
@@ -390,15 +391,16 @@ def build_agg(ext_modules, packages, numerix):
390
391
391
392
agg = ('agg_trans_affine.cpp' ,
392
393
'agg_path_storage.cpp' ,
393
- 'agg_vcgen_stroke.cpp' ,
394
394
'agg_bezier_arc.cpp' ,
395
395
'agg_curves.cpp' ,
396
396
'agg_vcgen_dash.cpp' ,
397
+ 'agg_vcgen_stroke.cpp' ,
398
+ #'agg_vcgen_markers_term.cpp',
397
399
'agg_rasterizer_scanline_aa.cpp' ,
398
400
)
399
401
400
402
if numerix in ["numarray" ,"both" ]: # Build for numarray
401
- deps = ['agg22 /src/%s' % name for name in agg ]
403
+ deps = ['%s /src/%s' % ( AGG_VERSION , name ) for name in agg ]
402
404
deps .extend (('src/ft2font.cpp' , 'src/mplutils.cpp' ))
403
405
deps .extend (glob .glob ('CXX/*.cxx' ))
404
406
deps .extend (glob .glob ('CXX/*.c' ))
@@ -414,7 +416,7 @@ def build_agg(ext_modules, packages, numerix):
414
416
add_ft2font_flags (module )
415
417
ext_modules .append (module )
416
418
if numerix in ["Numeric" ,"both" ]: # Build for Numeric
417
- deps = ['agg22 /src/%s' % name for name in agg ]
419
+ deps = ['%s /src/%s' % ( AGG_VERSION , name ) for name in agg ]
418
420
deps .extend (('src/ft2font.cpp' , 'src/mplutils.cpp' ))
419
421
deps .extend (glob .glob ('CXX/*.cxx' ))
420
422
deps .extend (glob .glob ('CXX/*.c' ))
@@ -448,7 +450,7 @@ def build_image(ext_modules, packages, numerix):
448
450
if numerix in ["numarray" ,"both" ]: # Build for numarray
449
451
temp_copy ('src/_image.cpp' , 'src/_na_image.cpp' )
450
452
deps = ['src/_na_image.cpp' , 'src/mplutils.cpp' ]
451
- deps .extend (['agg22 /src/%s' % name for name in agg ])
453
+ deps .extend (['%s /src/%s' % ( AGG_VERSION , name ) for name in agg ])
452
454
deps .extend (glob .glob ('CXX/*.cxx' ))
453
455
deps .extend (glob .glob ('CXX/*.c' ))
454
456
module = Extension (
@@ -463,7 +465,7 @@ def build_image(ext_modules, packages, numerix):
463
465
if numerix in ["Numeric" ,"both" ]: # Build for Numeric
464
466
temp_copy ('src/_image.cpp' , 'src/_nc_image.cpp' )
465
467
deps = ['src/_nc_image.cpp' , 'src/mplutils.cpp' ]
466
- deps .extend (['agg22 /src/%s' % name for name in agg ])
468
+ deps .extend (['%s /src/%s' % ( AGG_VERSION , name ) for name in agg ])
467
469
deps .extend (glob .glob ('CXX/*.cxx' ))
468
470
deps .extend (glob .glob ('CXX/*.c' ))
469
471
@@ -480,16 +482,24 @@ def build_image(ext_modules, packages, numerix):
480
482
481
483
def build_swigagg (ext_modules , packages ):
482
484
# setup the swig agg wrapper
483
- deps = ['src/agg.cxx' ,
484
- 'agg22/src/agg_path_storage.cpp' ,
485
- 'agg22/src/agg_bezier_arc.cpp' ,
486
- 'agg22/src/agg_trans_affine.cpp' ,
487
- ]
485
+ deps = ['src/agg.cxx' ]
486
+ deps .extend (['%s/src/%s' % (AGG_VERSION , fname ) for fname in
487
+ (
488
+ 'agg_trans_affine.cpp' ,
489
+ 'agg_path_storage.cpp' ,
490
+ 'agg_bezier_arc.cpp' ,
491
+ 'agg_vcgen_dash.cpp' ,
492
+ 'agg_vcgen_stroke.cpp' ,
493
+ 'agg_rasterizer_scanline_aa.cpp' ,
494
+ )
495
+ ])
496
+
497
+
488
498
agg = Extension ('matplotlib._agg' ,
489
499
deps ,
490
500
)
491
501
492
- agg .include_dirs .extend (['agg22 /include' , 'src' , 'swig' ])
502
+ agg .include_dirs .extend (['%s /include' % AGG_VERSION , 'src' , 'swig' ])
493
503
agg .libraries .extend (['stdc++' , 'm' ])
494
504
ext_modules .append (agg )
495
505
0 commit comments