diff -r -C 2 fluxus/SConstruct fluxus-080528cvs-mac/SConstruct
*** fluxus/SConstruct	Mon May 12 16:49:05 2008
--- fluxus-080528cvs-mac/SConstruct	Wed May 28 18:14:15 2008
***************
*** 24,33 ****
  Prefix = ARGUMENTS.get('Prefix','/usr/local')
  PLTPrefix = ARGUMENTS.get('PLTPrefix','/usr/local')
! PLTInclude = PLTPrefix + "/include/plt"
! PLTLib = PLTPrefix + "/lib/plt"
! DataInstall = DESTDIR + Prefix + "/share/fluxus-"+FluxusVersion
  BinInstall = DESTDIR + Prefix + "/bin"
  
! CollectsLocation = PLTPrefix + "/lib/plt/collects/"
  CollectsInstall = DESTDIR + CollectsLocation + "fluxus-"+FluxusVersion
  
--- 24,35 ----
  Prefix = ARGUMENTS.get('Prefix','/usr/local')
  PLTPrefix = ARGUMENTS.get('PLTPrefix','/usr/local')
! PLTInclude = ARGUMENTS.get('PLTInclude', PLTPrefix + "/include/plt")
! PLTLib = ARGUMENTS.get('PLTLib', PLTPrefix + "/lib/plt")
  BinInstall = DESTDIR + Prefix + "/bin"
  
! DataLocation = Prefix + "/share/fluxus-"+FluxusVersion
! DataInstall = DESTDIR + DataLocation
! 
! CollectsLocation = PLTPrefix + "/collects/"
  CollectsInstall = DESTDIR + CollectsLocation + "fluxus-"+FluxusVersion
  
***************
*** 47,58 ****
  
  env = Environment(CCFLAGS = '-ggdb -pipe -Wall -O3 -ffast-math -Wno-unused -fPIC',
- 		  LIBPATH = LibPaths,
- 		  CPPPATH = IncludePaths,
  		  VERSION_NUM = FluxusVersion)
  		  
  env.Append(CCFLAGS=' -DFLUXUS_MAJOR_VERSION='+MajorVersion)
  env.Append(CCFLAGS=' -DFLUXUS_MINOR_VERSION='+MinorVersion)
  env.Append(CCFLAGS=" -DCOLLECTS_LOCATION="+"\"\\\""+CollectsLocation+"\"\\\"")
! env.Append(CCFLAGS=" -DDATA_LOCATION="+"\"\\\""+DataInstall+"\"\\\"")
  
  # multitexturing causes crashes on some cards, default it to off, and
--- 49,65 ----
  
  env = Environment(CCFLAGS = '-ggdb -pipe -Wall -O3 -ffast-math -Wno-unused -fPIC',
  		  VERSION_NUM = FluxusVersion)
  		  
+ if env['PLATFORM'] == 'darwin':
+ 	IncludePaths += ['/opt/local/include',
+ 					'/opt/local/include/freetype2']
+ 	LibPaths += ['/opt/local/lib']
+ 
+ env.Append(CPPPATH = IncludePaths)
+ env.Append(LIBPATH = LibPaths)
  env.Append(CCFLAGS=' -DFLUXUS_MAJOR_VERSION='+MajorVersion)
  env.Append(CCFLAGS=' -DFLUXUS_MINOR_VERSION='+MinorVersion)
  env.Append(CCFLAGS=" -DCOLLECTS_LOCATION="+"\"\\\""+CollectsLocation+"\"\\\"")
! env.Append(CCFLAGS=" -DDATA_LOCATION="+"\"\\\""+DataLocation+"\"\\\"")
  
  # multitexturing causes crashes on some cards, default it to off, and
***************
*** 72,80 ****
  # need to do this to get scons to link plt's mzdyn.o
  env["STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME"]=1
! MZDYN = PLTPrefix+"/lib/plt/mzdyn.o"
  	
  if ARGUMENTS.get("3M","1")=="1":
  	env.Append(CCFLAGS=' -DMZ_PRECISE_GC')
! 	MZDYN = PLTPrefix+"/lib/plt/mzdyn3m.o"
  
  ################################################################################
--- 79,87 ----
  # need to do this to get scons to link plt's mzdyn.o
  env["STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME"]=1
! MZDYN = PLTLib + "/mzdyn.o"
  	
  if ARGUMENTS.get("3M","1")=="1":
  	env.Append(CCFLAGS=' -DMZ_PRECISE_GC')
! 	MZDYN = PLTLib + "/mzdyn3m.o"
  
  ################################################################################
***************
*** 98,106 ****
  		["fftw3", "fftw3.h"],
  		["lo", "lo/lo.h"]]
! 				
! if env['PLATFORM'] == 'darwin':
! 	env.Replace(LINK = "macos/libtool --mode=link g++")
! 	env.Prepend(LINKFLAGS = ["-static"])
! else:
  	env.Prepend(LINKFLAGS = ["-rdynamic"])  
  	LibList += [["X11", "X11/Xlib.h"],
--- 105,111 ----
  		["fftw3", "fftw3.h"],
  		["lo", "lo/lo.h"]]
! 
! 
! if env['PLATFORM'] == 'posix':
  	env.Prepend(LINKFLAGS = ["-rdynamic"])  
  	LibList += [["X11", "X11/Xlib.h"],
***************
*** 119,122 ****
--- 124,130 ----
  				 ["SM", "X11/Xlib.h"], 
  				 ["ICE", "X11/Xlib.h"]] + LibList;
+ elif env['PLATFORM'] == 'darwin':
+ 	env.Append(FRAMEWORKS = ['GLUT', 'OpenGL', 'CoreAudio' ,'PLT_MzScheme'],
+ 		FRAMEWORKPATH = [PLTLib])
  
  ################################################################################
***************
*** 129,136 ****
  	conf = Configure(env)
  	
  	# all libraries are required, but they can be checked for independently
  	# (hence autoadd=0), which allows us to speed up the tests ...
  	for (lib,headers) in LibList:
! 		if not conf.CheckLibWithHeader(lib, headers, 'C', autoadd = 1):
  			print "ERROR: '%s' must be installed!" % (lib)
  			Exit(1)
--- 137,151 ----
  	conf = Configure(env)
  	
+ 	# FIXME: check mzscheme3m framework properly on osx
+ 	if env['PLATFORM'] == 'darwin':
+ 		if not conf.CheckHeader('scheme.h'):
+ 			print "ERROR: 'mzscheme3m' must be installed!"
+ 			Exit(1)
+ 		LibList = filter(lambda x: x[0] != 'mzscheme3m', LibList)
+ 
  	# all libraries are required, but they can be checked for independently
  	# (hence autoadd=0), which allows us to speed up the tests ...
  	for (lib,headers) in LibList:
! 		if not conf.CheckLibWithHeader(lib, headers, 'C', autoadd = 0):
  			print "ERROR: '%s' must be installed!" % (lib)
  			Exit(1)
***************
*** 169,173 ****
  ################################################################################
  # packaging / installing
! 
  if env['PLATFORM'] == 'darwin':
  	from macos.osxbundle import *
--- 184,188 ----
  ################################################################################
  # packaging / installing
! '''
  if env['PLATFORM'] == 'darwin':
  	from macos.osxbundle import *
***************
*** 187,191 ****
  				       DmgFiles))
  else:
! 	env.Install(Install, Target)
! 	env.Alias('install', DESTDIR + Prefix)
  
--- 202,207 ----
  				       DmgFiles))
  else:
! '''
! env.Install(Install, Target)
! env.Alias('install', [DESTDIR + Prefix, CollectsInstall])
  
Only in fluxus-080528cvs-mac/macos: __init__.pyc
Only in fluxus-080528cvs-mac/macos: osxbundle.pyc
diff -r -C 2 fluxus/modules/fluxus-audio/SConscript fluxus-080528cvs-mac/modules/fluxus-audio/SConscript
*** fluxus/modules/fluxus-audio/SConscript	Mon May 12 16:49:06 2008
--- fluxus-080528cvs-mac/modules/fluxus-audio/SConscript	Wed May 28 23:40:15 2008
***************
*** 6,18 ****
  Import("env", "BinaryModulesLocation", "MZDYN")
  
! Target       = "fluxus-audio_ss.so"
  
! Install      = BinaryModulesLocation
  Libs =  Split("jack fftw3 sndfile")
  
  Source = Split("src/FluxusAudio.cpp \
  		src/AudioCollector.cpp \
! 		src/JackClient.cpp "+ 
! 		MZDYN)
  		
  env.SharedLibrary(source = Source, 
--- 6,21 ----
  Import("env", "BinaryModulesLocation", "MZDYN")
  
! if env['PLATFORM'] == 'darwin':
! 	Target = "fluxus-audio_ss.dylib"
! else:
! 	Target = "fluxus-audio_ss.so"
  
! Install = BinaryModulesLocation
  Libs =  Split("jack fftw3 sndfile")
  
  Source = Split("src/FluxusAudio.cpp \
  		src/AudioCollector.cpp \
! 		src/JackClient.cpp") + \
! 		[MZDYN]
  		
  env.SharedLibrary(source = Source, 
diff -r -C 2 fluxus/modules/fluxus-engine/SConscript fluxus-080528cvs-mac/modules/fluxus-engine/SConscript
*** fluxus/modules/fluxus-engine/SConscript	Mon May 12 16:49:06 2008
--- fluxus-080528cvs-mac/modules/fluxus-engine/SConscript	Wed May 28 23:39:56 2008
***************
*** 7,13 ****
  Import("env", "BinaryModulesLocation", "MZDYN")
  
! Target = "fluxus-engine_ss.so"
  Install = BinaryModulesLocation
! Libs = Split("GL GLU glut GLEW fluxus png ode tiff jpeg")
  
  Source = Split("src/Engine.cpp \
--- 7,19 ----
  Import("env", "BinaryModulesLocation", "MZDYN")
  
! if env['PLATFORM'] == 'darwin':
! 	    Target = "fluxus-engine_ss.dylib"
! else:
! 		Target = "fluxus-engine_ss.so"
! 
  Install = BinaryModulesLocation
! Libs = Split("GLEW fluxus png ode tiff jpeg")
! if env['PLATFORM'] != 'darwin':
! 	    Libs += Split("GL GLU glut")
  
  Source = Split("src/Engine.cpp \
***************
*** 24,29 ****
  		src/PhysicsFunctions.cpp \
  		src/TurtleBuilder.cpp \
! 		src/PFuncContainer.cpp " + 
! 		MZDYN)
  		
  env.SharedLibrary(source = Source, 
--- 30,35 ----
  		src/PhysicsFunctions.cpp \
  		src/TurtleBuilder.cpp \
! 		src/PFuncContainer.cpp") + \
! 		[MZDYN]
  		
  env.SharedLibrary(source = Source, 
diff -r -C 2 fluxus/modules/fluxus-osc/SConscript fluxus-080528cvs-mac/modules/fluxus-osc/SConscript
*** fluxus/modules/fluxus-osc/SConscript	Mon May 12 16:49:06 2008
--- fluxus-080528cvs-mac/modules/fluxus-osc/SConscript	Wed May 28 17:52:25 2008
***************
*** 6,10 ****
  Import("env", "BinaryModulesLocation", "MZDYN")
  
! Target = "fluxus-osc_ss.so"
  Install = BinaryModulesLocation
  Libs = Split("lo")
--- 6,14 ----
  Import("env", "BinaryModulesLocation", "MZDYN")
  
! if env['PLATFORM'] == 'darwin':
! 	Target = "fluxus-osc_ss.dylib"
! else:
! 	Target = "fluxus-osc_ss.so"
! 
  Install = BinaryModulesLocation
  Libs = Split("lo")
***************
*** 12,17 ****
  Source = Split("src/FluxusOSC.cpp \
  		src/OSCServer.cpp \
! 		src/OSCCore.cpp "+ 
! 		MZDYN)
  
  env.SharedLibrary(source = Source, 
--- 16,21 ----
  Source = Split("src/FluxusOSC.cpp \
  		src/OSCServer.cpp \
! 		src/OSCCore.cpp") + \
! 		[MZDYN]
  
  env.SharedLibrary(source = Source, 
Only in fluxus-080528cvs-mac/src: base.c