Author: ArcRiley
Date: 2008-02-11 01:44:30 -0500 (Mon, 11 Feb 2008)
New Revision: 856
Modified:
trunk/pysoy/setup.py
Log:
removed (now) redundant code in setup.py related to _core
Modified: trunk/pysoy/setup.py
===================================================================
--- trunk/pysoy/setup.py 2008-02-11 06:29:22 UTC (rev 855)
+++ trunk/pysoy/setup.py 2008-02-11 06:44:30 UTC (rev 856)
@@ -26,7 +26,8 @@
version = 'Trunk'
modules = {
- '_datatypes' : ['GLEW','GL','glib-2.0','ode'],
+ '_core' : ['GLEW', 'GL', 'ode', 'glib-2.0'],
+ '_datatypes' : ['GLEW', 'GL', 'ode', 'glib-2.0'],
'_internals' : ['glib-2.0', 'gthread-2.0'],
'actions' : ['ode'],
'atoms' : [],
@@ -70,13 +71,11 @@
}
pyrex_sources.append('src/_core/soy._core.pyx')
include_path.append('src/_core/')
+ modules['_core'].append('gdi32')
for m in modules:
- extensions.append( Extension( name=m,
- sources=['src/%s/soy.%s.c'%(m,m)],
- libraries=[translate[i] for i in modules[m]]
) )
- extensions.append( Extension( name = '_core',
- sources = ['src/_core/soy._core.c',],
- libraries = ['opengl32', 'glew32', 'ode',
'gdi32', 'glib-2.0', 'gthread-2.0']))
+ extensions.append(Extension(name=m,
+ sources=['src/%s/soy.%s.c'%(m,m)],
+ libraries=[translate[i] for i in modules[m]]))
scripts.append('win32_postinstall.py')
# Apple OSX
@@ -87,16 +86,11 @@
'-framework', 'OpenGL',
]
for m in modules:
- extensions.append( Extension( name=m,
- sources=['src/%s/soy.%s.c'%(m,m)],
- libraries=modules[m],
- extra_compile_args = frameworks,
- extra_link_args = frameworks ) )
- extensions.append( Extension( name = '_core',
- sources = ['src/_core-osx/soy._core.c',],
- libraries = ['GL', 'glib-2.0', 'gthread-2.0'],
+ extensions.append(Extension(name=m,
+ sources=['src/%s/soy.%s.c'%(m,m)],
+ libraries=modules[m],
extra_compile_args = frameworks,
- extra_link_args = frameworks ) )
+ extra_link_args = frameworks))
# GNU/Linux, BSD, etc
else :
@@ -106,16 +100,14 @@
'-I', '/usr/lib/glib-2.0/include',
'-I', '/usr/include/cairo',
]
+ modules['_core'].append('X11')
+ modules['_core'].append('Xxf86vm')
for m in modules:
- extensions.append( Extension( name=m,
- sources=['src/%s/soy.%s.c'%(m,m)],
- extra_compile_args = include_dirs,
- libraries=modules[m] ) )
- extensions.append( Extension( name = '_core',
- sources = ['src/_core/soy._core.c',],
+ extensions.append(Extension(name=m,
+ sources=['src/%s/soy.%s.c'%(m,m)],
extra_compile_args = include_dirs,
- libraries = ['GLEW', 'GL', 'X11', 'Xxf86vm',
- 'ode', 'glib-2.0']))
+ libraries=modules[m]))
+
#
############################################################################
_______________________________________________
PySoy-SVN mailing list
[email protected]
http://www.pysoy.org/mailman/listinfo/pysoy-svn
