diff setup.py @ 1849:301bc61643a9 math_module

merged changes from trunk
author lorenz
date Mon, 16 Nov 2009 18:31:40 +0000
parents 02c1e8e9c102
children
line wrap: on
line diff
--- a/setup.py	Mon Nov 16 18:05:30 2009 +0000
+++ b/setup.py	Mon Nov 16 18:31:40 2009 +0000
@@ -14,7 +14,7 @@
 
 METADATA = {
     "name":             "pygame",
-    "version":          "1.9.0rc3",
+    "version":          "1.9.2pre",
     "license":          "LGPL",
     "url":              "http://www.pygame.org",
     "author":           "Pete Shinners, Rene Dudfield, Marcus von Appen, Bob Pendleton, others...",
@@ -154,6 +154,7 @@
 if sys.version_info >= (3, 0, 0):
     python3_skip = ['scrap',
                     '_camera',
+                    '_movie',
                     '_numericsurfarray',
                     '_numericsndarray',
                     ]
@@ -187,7 +188,9 @@
               ['test',
                   [['fixtures',
                       [['xbm_cursors',
-                          ['*.xbm']]]]]])
+                          ['*.xbm']],
+                       ['fonts',
+                          ['*.ttf', '*.otf']]]]]])
 
 #examples
 add_datafiles(data_files, 'pygame/examples',
@@ -363,7 +366,9 @@
                     if e.sources[i].endswith('scale_mmx.c'):
                         del e.sources[i]
                         return
-    replace_scale_mmx()
+    # linking to 64-bit mingw generated scale_mmx.obj fails
+    if not '64 bit' in sys.version:
+        replace_scale_mmx()
 
 
 #clean up the list of extensions