Changeset 3259

Timestamp:

Jun 29, 2006, 3:49:10 PM (18 years ago)

Author:

jack

Message:

Preliminary SCons support for Win32.

Files:

• SConstruct (modified) (3 diffs)
• inundation/utilities/SConscript (modified) (1 diff)

SConstruct

@@ -1 +1 @@
 import os
 import sys
+
+env = Environment()
 
 # Find the path for Python.h and then share it to other SConscripts later on
@@ -6 +8 @@
 if sys.platform == 'win32':  #Windows
     python_include = os.path.join(sys.exec_prefix, 'include')
+    # Windows installs need to be told the lib path and the python library name
+    # else it won't work right.
+    python_libdir = os.path.join(sys.exec_prefix, 'libs')
+    try:
+        env['LIBPATH'] = env['LIBPATH'] + [python_libdir]
+    except KeyError:
+        env['LIBPATH'] = [python_libdir]
+    python_libname = 'python%d%d' % (sys.version_info[0], sys.version_info[1])
+    try:
+        env['LIBS'] = env['LIBS'] + [python_libname]
+    except KeyError:
+        env['LIBS'] = [python_libname]
 else:
     python_include = os.path.join(os.path.join(sys.exec_prefix, 'include'),
@@ -20 +34 @@
     package called something like python2.3-dev""" %headerfile
 
-env = Environment()
 try:
     env['CPPPATH'] = env['CPPPATH'] + [python_include]
 except KeyError:
     env['CPPPATH'] = [python_include]
+
 Export('env')
 

inundation/utilities/SConscript

@@ -1 +1 @@
 Import('env')
 env.SharedLibrary('polygon_ext', ['polygon_ext.c'])
+env.SharedLibrary('util_ext', ['util_ext.c'])