[pypy-svn] r62675 - pypy/trunk/pypy/rlib/rsdl

[santagada at codespeak.net]

Author: santagada
Date: Sat Mar  7 00:26:29 2009
New Revision: 62675

Modified:
   pypy/trunk/pypy/rlib/rsdl/RSDL.py
   pypy/trunk/pypy/rlib/rsdl/eci.py
Log:
removed tons of hacks on the eci code, and reverted a check that made some of test_video fail.

Modified: pypy/trunk/pypy/rlib/rsdl/RSDL.py
==============================================================================
--- pypy/trunk/pypy/rlib/rsdl/RSDL.py	(original)
+++ pypy/trunk/pypy/rlib/rsdl/RSDL.py	Sat Mar  7 00:26:29 2009
@@ -227,7 +227,7 @@
 # ------------------------------------------------------------------------------
 
 
-if sys.platform == 'darwin' and we_are_translated():
+if sys.platform == 'darwin':
     def Init(flags):
         if not we_are_translated():
             from AppKit import NSApplication

Modified: pypy/trunk/pypy/rlib/rsdl/eci.py
==============================================================================
--- pypy/trunk/pypy/rlib/rsdl/eci.py	(original)
+++ pypy/trunk/pypy/rlib/rsdl/eci.py	Sat Mar  7 00:26:29 2009
@@ -6,20 +6,10 @@
 def get_rsdl_compilation_info():
     if sys.platform == 'darwin':
         eci = ExternalCompilationInfo(
-            includes = ['SDL.h', 
-                        #'Init.h',
-                        #'SDLMain.m'
-                        #'SDLMain.h'*/
-                        ],
-            include_dirs = ['/Library/Frameworks/SDL.framework/Headers',
-                            #str(py.magic.autopath().dirpath().join('macosx-sdl-main'))
-                            ],
+            includes = ['SDL.h'],
+            include_dirs = ['/Library/Frameworks/SDL.framework/Headers'],
             link_extra = [
                 str(py.magic.autopath().dirpath().join('macosx-sdl-main/SDLMain.m')),
-                #'macosx-sdl-main/SDLMain.m',
-                '-I', '/Library/Frameworks/SDL.framework/Headers',
-                '-framework', 'Cocoa',
-                '-framework', 'SDL',
             ],
             frameworks = ['SDL', 'Cocoa']
         )