Changeset e1feb88 in git

Timestamp:

Sep 14, 2005, 8:22:57 AM (19 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

2c522621b85484816c0f82af12f0dc6508ee36e7

Parents:

b7d0419bed13bbf3f57d533f3b41c62075877940

Message:

*bricken: Mac, opts CXX and FINK_PREFIX


git-svn-id: file:///usr/local/Singular/svn/trunk@8611 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• modules/python/SConstruct (modified) (4 diffs)

modules/python/SConstruct

@@ -9 +9 @@
 PYTHONPREFIX="/usr"
 FINKPREFIX=None
+env=Environment()
+platform=env['PLATFORM']
+
 opts = Options('custom.py')
-opts.Add('CXX', 'The C++ compiler.')
-opts.Add('FINK_PREFIX', 'Prefix for fink on Mac OS X, usually /sw')
+if platform=="darwin":
+    opts.Add('CXX', 'The C++ compiler.',"g++-3.3")
+    opts.Add('FINK_PREFIX', 'Prefix for fink on Mac OS X, usually /sw','/sw')
+else:
+    opts.Add('CXX', 'The C++ compiler.')
+
 
 
@@ -43 +50 @@
 
 env = Environment(options=opts)
+
 try:
-    PYTHONSEARCH.prepend(PythonConfig(version="2.4", prefix=env['FINK_PREFIX'],\
+    PYTHONSEARCH.insert(0,PythonConfig(version="2.4", prefix=env['FINK_PREFIX'],\
         libdir=env['FINK_PREFIX']+"/lib/python2.4/config/"))
 except:
@@ -82 +90 @@
 if (env['PLATFORM']=="darwin"):
     applelink.generate(env)
+    
 SING_ROOT="../.."
 SING_ARCH=re.sub("\r|\n","",os.popen("../../singuname.sh").read())
@@ -97 +106 @@
 def module_target(*args,**keywords):
     if env['PLATFORM']=="darwin":
+        print "Hello this is a Mac"
         keywords['LINKFLAGS']="-bundle_loader ../../Singular/Singular"
         try:
-            keywords('LIBPATH').append(env['FINK_PREFIX']+"/lib")
-            keywords('CPPPATH').append(env['FINK_PREFIX']+"/include")
+            keywords['LIBPATH'].append(env['FINK_PREFIX']+"/lib")
+            keywords['CPPPATH'].append(env['FINK_PREFIX']+"/include")
         except:
             pass