Commits

Lenard Lindstrom committed adf93b5

undo accidental changes to Setup.in and __init__.py

Comments (0)

Files changed (2)

 #any unavailable optional modules in the first optional section.
 
 
-#Optional macros: these may be overridden.
-PORTTIME =
-
 #--StartConfig
 SDL = -I/usr/include/SDL -D_REENTRANT -lSDL
 FONT = -lSDL_ttf
 font src/font.c $(SDL) $(FONT) $(DEBUG)
 mixer src/mixer.c $(SDL) $(MIXER) $(DEBUG)
 mixer_music src/music.c $(SDL) $(MIXER) $(DEBUG)
-#_numericsurfarray src/_numericsurfarray.c $(SDL) $(DEBUG)
-#_numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
-#movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
-#scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
-#_camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
-#pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
+_numericsurfarray src/_numericsurfarray.c $(SDL) $(DEBUG)
+_numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
+movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
+scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
+_camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
+pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
 
 GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
 #GFX = src/SDL_gfx/SDL_gfxBlitFunc.c src/SDL_gfx/SDL_gfxPrimitives.c 
 #SDL as a dependency. these should not be altered
 
 base src/base.c $(SDL) $(DEBUG)
-#cdrom src/cdrom.c $(SDL) $(DEBUG)
+cdrom src/cdrom.c $(SDL) $(DEBUG)
 color src/color.c $(SDL) $(DEBUG)
 constants src/constants.c $(SDL) $(DEBUG)
 display src/display.c $(SDL) $(DEBUG)
 event src/event.c $(SDL) $(DEBUG)
-#fastevent src/fastevent.c src/fastevents.c $(SDL) $(DEBUG)
+fastevent src/fastevent.c src/fastevents.c $(SDL) $(DEBUG)
 key src/key.c $(SDL) $(DEBUG)
 mouse src/mouse.c $(SDL) $(DEBUG)
 rect src/rect.c $(SDL) $(DEBUG)
 surface src/surface.c src/alphablit.c src/surface_fill.c $(SDL) $(DEBUG)
 surflock src/surflock.c $(SDL) $(DEBUG)
 time src/time.c $(SDL) $(DEBUG)
-#joystick src/joystick.c $(SDL) $(DEBUG)
+joystick src/joystick.c $(SDL) $(DEBUG)
 draw src/draw.c $(SDL) $(DEBUG)
 image src/image.c $(SDL) $(DEBUG)
-#overlay src/overlay.c $(SDL) $(DEBUG)
+overlay src/overlay.c $(SDL) $(DEBUG)
 transform src/transform.c src/rotozoom.c src/scale2x.c src/scale_mmx.c $(SDL) $(DEBUG)
 mask src/mask.c src/bitmask.c $(SDL) $(DEBUG)
-#bufferproxy src/bufferproxy.c $(SDL) $(DEBUG)
-#pixelarray src/pixelarray.c $(SDL) $(DEBUG)
-#_arraysurfarray src/_arraysurfarray.c $(SDL) $(DEBUG)
+bufferproxy src/bufferproxy.c $(SDL) $(DEBUG)
+pixelarray src/pixelarray.c $(SDL) $(DEBUG)
+_arraysurfarray src/_arraysurfarray.c $(SDL) $(DEBUG)
 
 #first, the "required" modules
 from pygame.base import *
 from pygame.constants import *
-###from pygame.version import *
+from pygame.version import *
 from pygame.rect import Rect
 from pygame.compat import geterror
 import pygame.rwobject
 import pygame.surflock
 import pygame.color
 Color = color.Color
-#__version__ = ver
+__version__ = ver
 
 #next, the "standard" modules
 #we still allow them to be missing for stripped down pygame distributions
-###try: import pygame.cdrom
-###except (ImportError,IOError):cdrom=MissingModule("cdrom", geterror(), 1)
+try: import pygame.cdrom
+except (ImportError,IOError):cdrom=MissingModule("cdrom", geterror(), 1)
 
 try: import pygame.cursors
 except (ImportError,IOError):cursors=MissingModule("cursors", geterror(), 1)
 try: import pygame.image
 except (ImportError,IOError):image=MissingModule("image", geterror(), 1)
 
-###try: import pygame.joystick
-###except (ImportError,IOError):joystick=MissingModule("joystick", geterror(), 1)
+try: import pygame.joystick
+except (ImportError,IOError):joystick=MissingModule("joystick", geterror(), 1)
 
 try: import pygame.key
 except (ImportError,IOError):key=MissingModule("key", geterror(), 1)
 except (ImportError,IOError):sprite=MissingModule("sprite", geterror(), 1)
 
 
-###try: import pygame.threads
-###except (ImportError,IOError):threads=MissingModule("threads", geterror(), 1)
+try: import pygame.threads
+except (ImportError,IOError):threads=MissingModule("threads", geterror(), 1)
 
 
 def warn_unwanted_files():
 try: import pygame.scrap
 except (ImportError,IOError):scrap=MissingModule("scrap", geterror(), 0)
 
-###try: import pygame.surfarray
-###except (ImportError,IOError):surfarray=MissingModule("surfarray", geterror(), 0)
+try: import pygame.surfarray
+except (ImportError,IOError):surfarray=MissingModule("surfarray", geterror(), 0)
 
-###try: import pygame.sndarray
-###except (ImportError,IOError):sndarray=MissingModule("sndarray", geterror(), 0)
+try: import pygame.sndarray
+except (ImportError,IOError):sndarray=MissingModule("sndarray", geterror(), 0)
 
 try: import pygame.fastevent
 except (ImportError,IOError):fastevent=MissingModule("fastevent", geterror(), 0)
 #there's also a couple "internal" modules not needed
 #by users, but putting them here helps "dependency finder"
 #programs get everything they need (like py2exe)
-###try: import pygame.imageext; del pygame.imageext
-###except (ImportError,IOError):pass
+try: import pygame.imageext; del pygame.imageext
+except (ImportError,IOError):pass
 
 def packager_imports():
     """
     import pygame.mac_scrap
     import pygame.bufferproxy
     import pygame.colordict
-    import pygame.compat
 
 #make Rects pickleable
 try:
 copy_reg.pickle(Rect, __rect_reduce, __rect_constructor)
 
 #cleanup namespace
-###del pygame, os, sys, rwobject, surflock, MissingModule, copy_reg, geterror
-del pygame, os, sys, MissingModule, copy_reg, geterror
+del pygame, os, sys, rwobject, surflock, MissingModule, copy_reg, geterror