From 2c4349aa3ac9a6d5ee1f7b1aeb5eb0ee1cb54690 Mon Sep 17 00:00:00 2001
From: José Fonseca <jrfonseca@tungstengraphics.com>
Date: Tue, 15 Jul 2008 07:56:42 +0900
Subject: python: Move the python scons code to a separate tool module.

---
 src/gallium/state_trackers/python/SConscript | 44 +++++-----------------------
 1 file changed, 7 insertions(+), 37 deletions(-)

(limited to 'src/gallium')

diff --git a/src/gallium/state_trackers/python/SConscript b/src/gallium/state_trackers/python/SConscript
index 854cd83b7c2..687c46bfd76 100644
--- a/src/gallium/state_trackers/python/SConscript
+++ b/src/gallium/state_trackers/python/SConscript
@@ -7,50 +7,20 @@ if 'python' in env['statetrackers']:
 
     env = env.Clone()
     
-    env.Append(CPPPATH = '.')
+    env.Tool('python')
     
     env.Tool('swig')
     env.Append(SWIGPATH = ['#src/gallium/include', '#src/gallium/include/pipe'])
     env.Append(SWIGFLAGS = ['-python', '-keyword'])
     
-    # http://www.scons.org/wiki/PythonExtensions
-    #env.AppendUnique(CPPATH = [distutils.sysconfig.get_python_inc()])
-    #distutils.sysconfig.get_config_vars('SO')
-        
-    env['SHLIBPREFIX'] = ''
-    
-    if platform in ['linux']:
-        env.ParseConfig('python-config --cflags --ldflags --libs')
-        
-    if platform in ['windows']:
-        python_root = sys.prefix
-        python_version = '%u%u' % sys.version_info[:2]
-        python_include = os.path.join(python_root, 'include')
-        python_libs = os.path.join(python_root, 'libs')
-        python_lib = os.path.join(python_libs, 'python' + python_version + '.lib')
-        
-        env.Append(CPPPATH = [python_include])
-        env.Append(LIBPATH = [python_libs])
-        env.Append(LIBS = ['python' + python_version + '.lib'])
-        env.Replace(SHLIBSUFFIX = '.pyd')
-        
-        if env['debug']:
-            # XXX; python25_d.lib is not included in Python for windows, and 
-            # we'll get missing symbols unless we undefine _DEBUG
-            cppdefines = env['CPPDEFINES']
-            cppdefines = [define for define in cppdefines if define != '_DEBUG']
-            env.Replace(CPPDEFINES = cppdefines)
-        
-        # http://www.swig.org/Doc1.3/Windows.html
-        env['ENV']['PYTHON_INCLUDE'] = python_include
-        env['ENV']['PYTHON_LIB'] = python_lib
-        
+    env.Append(CPPPATH = '.')
+
     env.SharedLibrary(
-    	target = '_gallium',
-    	source = [
-    		'gallium.i',
+        target = '_gallium',
+        source = [
+            'gallium.i',
             'st_device.c',
             'st_softpipe_winsys.c',
-    	],
+        ],
         LIBS = softpipe + auxiliaries + env['LIBS'],
     )
-- 
cgit v1.2.3