[Dcplusplus-commit] SF.net SVN: adchpp: [103] adchpp/trunk

[<arn...@us...>]

Revision: 103
          http://adchpp.svn.sourceforge.net/adchpp/?rev=103&view=rev
Author:   arnetheduck
Date:     2007-12-10 04:04:03 -0800 (Mon, 10 Dec 2007)

Log Message:
-----------
more compile experiments

Modified Paths:
--------------
    adchpp/trunk/SConstruct
    adchpp/trunk/swig/SConscript

Modified: adchpp/trunk/SConstruct
===================================================================
--- adchpp/trunk/SConstruct	2007-12-10 11:00:24 UTC (rev 102)
+++ adchpp/trunk/SConstruct	2007-12-10 12:04:03 UTC (rev 103)
@@ -54,7 +54,7 @@
 
 # --- cut ---
 
-import os,sys
+import os,sys,distutils.sysconfig
 
 plugins = filter(lambda x: os.path.isfile(os.path.join('plugins', x, 'SConscript')), os.listdir('plugins'))
 
@@ -73,10 +73,10 @@
 	BoolOption('verbose', 'Show verbose command lines', 'no'),
 	BoolOption('savetemps', 'Save intermediate compilation files (assembly output)', 'no'),
 	BoolOption('nls', 'Build with internationalization support', 'yes'),
-	('prefix', 'Prefix to use when cross compiling', 'i386-mingw32-')
+	('prefix', 'Prefix to use when cross compiling', 'i386-mingw32-'),
+	('python', 'Python path to use when compiling python extensions', distutils.sysconfig.get_config_var('prefix'))
 )
 
-
 tools = ARGUMENTS.get('tools', tooldef)
 
 toolset = [tools, 'swig']

Modified: adchpp/trunk/swig/SConscript
===================================================================
--- adchpp/trunk/swig/SConscript	2007-12-10 11:00:24 UTC (rev 102)
+++ adchpp/trunk/swig/SConscript	2007-12-10 12:04:03 UTC (rev 103)
@@ -1,3 +1,5 @@
+# vim: set filetype: py
+
 Import('dev source_path')
 
 targets = []
@@ -60,36 +62,38 @@
 
 def buildPyModule():
 	import sys
-	if dev.is_win32() and sys.platform != 'win32':
-		print "Cross-compiling python module not supported"
-		return
 
 	env, target, sources = dev.prepare_build(source_path, '_pyadchpp', 'python.i')
 	env.Append(SWIGFLAGS=['-c++','-threads','-Wall','-python', '-O', '-classic'])
 
-	import distutils.sysconfig,distutils.cygwinccompiler
+	import distutils.sysconfig
 	
-	env.Append(CPPPATH=['#', distutils.sysconfig.get_python_inc()])
+	env.Append(CPPPATH=['#'])
 	if '_DEBUG' in env['CPPDEFINES']:
 		env['CPPDEFINES'].remove('_DEBUG')
 	if '/MDd' in env['CCFLAGS']:
 		env['CCFLAGS'].remove('/MDd')
 		env['CCFLAGS'].append('/MD')
 
-	if 'mingw' in env['TOOLS']:
-		compiler = distutils.cygwinccompiler.Mingw32CCompiler()
-		env.Append(LIBS=compiler.dll_libraries)
+	import os,distutils,sys
+	if dev.is_win32(): 
+		pyprefix = env['python']
+		incpath = os.path.join(pyprefix, "include")
+		libpath = os.path.join(pyprefix, "libs")
+		version = '25' # We only support 2.5.x for now
 
-	import os,distutils,sys
-	if env['PLATFORM'] == 'win32':
 		if 'mingw' in env['TOOLS']:
-			env.Append(LIBPATH=[distutils.sysconfig.get_config_var('prefix')])
+			sources += [File(os.path.join(libpath, "python" + version + ".lib"))]
+			env.Append(LIBS=['msvcr71'])
 		else:
-			env.Append(LIBPATH=[os.path.join(distutils.sysconfig.get_config_var('prefix'),"libs")])
-		env.Append(LIBS=["python"+"".join(sys.version[0:3].split(".")), 'adchpp'])
+			env.Append(LIBPATH=[libpath])
+			env.Append(LIBS=["python"+version])
+		env.Append(CPPPATH=[incpath])
 	else:
-		env.Append(LIBS=['python2.4', 'adchpp'])
+		env.Append(CPPPATH=[distutils.sysconfig.get_python_inc()])
+		env.Append(LIBS=['python2.4'])
 	
+	env.Append(LIBS=['adchpp'])
 	wrapper = build_path + 'python_wrap.cc'
 	pyfile = build_path + 'pyadchpp.py'
 	pytarget = dev.get_target(source_path, 'pyadchpp.py')
@@ -126,3 +130,4 @@
 buildLuaModule()
 
 Return('targets')
+


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.