casa-mp-base

--- SConstruct.orig 2012-02-13 18:17:02.000000000 +1100

+++ SConstruct  2012-03-08 15:57:06.000000000 +1100

@@ -353,6 +353,7 @@

 fileOptions.Add('customLIBS')

 fileOptions.Add('customLIBPATH')

 fileOptions.Add('customSHLINKFLAGS')

+fileOptions.Add('customLINKFLAGS')

 fileOptions.Add('customSWIGFLAGS')

 fileOptions.Update(commonEnvironment)

@@ -368,6 +369,8 @@

 commonEnvironment.Prepend(LIBPATH = customLIBPATH)

 customSHLINKFLAGS = commonEnvironment['customSHLINKFLAGS']

 commonEnvironment.Prepend(SHLINKFLAGS = customSHLINKFLAGS)

+customLINKFLAGS = commonEnvironment['customLINKFLAGS']

+commonEnvironment.Prepend(LINKFLAGS = customLINKFLAGS)

 customSWIGFLAGS = commonEnvironment['customSWIGFLAGS']

 commonEnvironment.Prepend(SWIGFLAGS = customSWIGFLAGS)

@@ -475,7 +478,7 @@

     else:

         commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib64'])

 else:

-    commonEnvironment.Prepend(LIBPATH = ['.', '#.', '/usr/local/lib'])

+    commonEnvironment.Prepend(LIBPATH = ['.', '#.'])

 if commonEnvironment['Word64'] == '1':

     if compilerSun():

@@ -510,7 +513,6 @@

         commonEnvironment.Append(LINKFLAGS = ['-Wl,-Bdynamic'])

 elif getPlatform() == 'darwin':

     commonEnvironment.Append(CCFLAGS = "-DMACOSX")

-    commonEnvironment.Append(CPPPATH = '/usr/local/include')

     commonEnvironment.Append(CCFLAGS = "-DPIPES")

     if commonEnvironment['useAltivec'] == '1':

         print 'CONFIGURATION DECISION: Using Altivec optimisation'

@@ -929,7 +931,7 @@

         s = '-DCS_DEFAULT_PLUGINDIR=\\"%s\\"' % tmp

         csoundLibraryEnvironment.Append(CPPFLAGS = [s])

     elif buildOSXFramework != 0:

-        tmp = '/Library/Frameworks/%s' % OSXFrameworkCurrentVersion

+        tmp = '__FRAMEWORKS_DIR__/%s' % OSXFrameworkCurrentVersion

         tmp += '/Resources/Opcodes'

         if commonEnvironment['useDouble'] != '0':

             tmp += '64'

@@ -1026,7 +1028,7 @@

         os.symlink(i[1], '%s/%s' % (OSXFrameworkBaseDir, i[0]))

 def MacOSX_InstallHeader(headerName):

-    if not buildOSXFramework:

+    if not buildOSXFramework or commonEnvironment['install'] != '1':

         return

     baseName = headerName[(headerName.rfind('/') + 1):]

     targetName = '%s/Headers/%s' % (OSXFrameworkCurrentVersion, baseName)

@@ -1038,8 +1040,8 @@

     csoundFrameworkEnvironment.Command(targetName, headerName, cmd)

 def MacOSX_InstallPlugin(fileName):

-    if buildOSXFramework:

-        print "COPYINNG plugin"

+    if buildOSXFramework and commonEnvironment['install'] == '1':

+        print "COPYING plugin"

         pluginDir = '%s/Resources/Opcodes' % OSXFrameworkCurrentVersion