[PD-cvs] pd/src SConscript,1.1.4.23,1.1.4.24

Update of /cvsroot/pure-data/pd/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27887

Modified Files: Tag: devel_0_39 SConscript Log Message: osx fixes, added app_pkg option to help building standalone

Index: SConscript =================================================================== RCS file: /cvsroot/pure-data/pd/src/Attic/SConscript,v retrieving revision 1.1.4.23 retrieving revision 1.1.4.24 diff -C2 -d -r1.1.4.23 -r1.1.4.24 *** SConscript 8 Sep 2005 09:49:43 -0000 1.1.4.23 --- SConscript 8 Sep 2005 18:06:48 -0000 1.1.4.24 *************** *** 18,21 **** --- 18,22 ---- BoolOption('lockfree', 'Build with lock-free fifos', True), BoolOption('pdlib', 'Build with pdlib', False), + BoolOption('app_pkg', 'Build for inclusion in .app package - OSX only', False), ('optimize', 'Optimize for specific architecture', None), ('prefix', 'install prefix', '/usr/local'), *************** *** 135,142 **** if pdenv['PLATFORM'] == 'darwin': portaudio = True

! ## hardcoding the search paths ... ugly, but works ! pdenv.Append(CPPPATH=Split("""/Library/Frameworks/Tk.framework/Headers/ /Library/Frameworks/Tcl.framework/Headers/"""))

--- 136,152 ---- if pdenv['PLATFORM'] == 'darwin': portaudio = True + + if conf.CheckLib('dl', 'dlopen'): + defs.append('DL_OPEN') + else: + print "libdl not found. dynamic loading of externals disabled"

! ## hardcoding the search paths ... ugly, but works ! if not pdenv['app_pkg']: ! pdenv.Append(CPPPATH=Split("""/Library/Frameworks/Tk.framework/Headers/ /Library/Frameworks/Tcl.framework/Headers/""")) + else: + pdenv.Append(CPPPATH=Split("""@executable_path/../Frameworks/Tk.framework/Headers/ + @executable_path/../Frameworks/Tcl.framework/Headers/"""))

*************** *** 152,195 **** Exit(1)

! if not conf.CheckLib('tcl'): ! for i in range (0,10): ! if conf.CheckLib('tcl8%s%d' % (sep,i)): ! break ! else: ! print "can't find tcl" ! Exit(1) ! ! if not conf.CheckLib('tk'): ! for i in range (0,10): ! if conf.CheckLib('tk8%s%d' % (sep,i)): ! break ! else: ! print "can't find tk"

add_cpppath = [] ! if not ( conf.CheckHeader('tcl.h') or conf.CheckHeader('tcl/tcl.h') ): ! for i in range (0,10): ! if conf.CheckHeader('tcl8.%d/tcl.h' % i): ! add_cpppath.append('/usr/include/tcl8.%d/' % i) ! break ! else: ! print "can't find tcl header" ! ! if not ( conf.CheckHeader('tk.h') or conf.CheckHeader('tk/tk.h') ): - for i in range (0,10): - if conf.CheckHeader('tk8.%d/tk.h' % i): - add_cpppath.append('/usr/include/tk8.%d/' % i) - break - else: for i in range (0,10): ! if conf.CheckHeader('tcl8.%d/tk.h' % i): break else: ! print "can't find tk header"

--- 162,208 ---- Exit(1)

+ if pdenv['PLATFORM'] != 'darwin': + if not conf.CheckLib('tcl'): + for i in range (0,10): + if conf.CheckLib('tcl8%s%d' % (sep,i)): + break + else: + print "can't find tcl" + Exit(1)

! if pdenv['PLATFORM'] != 'darwin': ! if not conf.CheckLib('tk'): ! for i in range (0,10): ! if conf.CheckLib('tk8%s%d' % (sep,i)): ! break ! else: ! print "can't find tk"

add_cpppath = [] ! if pdenv['PLATFORM'] != 'darwin': ! if not ( conf.CheckHeader('tcl.h') or conf.CheckHeader('tcl/tcl.h') ): ! for i in range (0,10): ! if conf.CheckHeader('tcl8.%d/tcl.h' % i): ! add_cpppath.append('/usr/include/tcl8.%d/' % i) ! break ! else: ! print "can't find tcl header" ! ! if pdenv['PLATFORM'] != 'darwin': ! if not ( conf.CheckHeader('tk.h') or conf.CheckHeader('tk/tk.h') ): for i in range (0,10): ! if conf.CheckHeader('tk8.%d/tk.h' % i): ! add_cpppath.append('/usr/include/tk8.%d/' % i) break else: ! for i in range (0,10): ! if conf.CheckHeader('tcl8.%d/tk.h' % i): ! break ! else: ! print "can't find tk header"

*************** *** 455,459 ****

if pdenv['PLATFORM']=='darwin': ! pdgui = pdenv.SharedLibrary('../bin/pdtcl', Split("t_main.c t_tkcmd.c"), LINKFLAGS='-framework Tcl -framework Tk') if pdenv['PLATFORM']=='win32': --- 468,476 ----

if pdenv['PLATFORM']=='darwin': ! if not pdenv['app_pkg']: ! pdgui = pdenv.SharedLibrary('../bin/pdtcl', Split("t_main.c t_tkcmd.c"), ! LINKFLAGS='-framework Tcl -framework Tk') ! else: ! pdgui = pdenv.SharedLibrary('../bin/pdtcl', Split("t_main.c t_tkcmd.c"), LINKFLAGS='-framework Tcl -framework Tk') if pdenv['PLATFORM']=='win32':