Update of /cvsroot/pure-data/pd/extra In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3930/extra
Modified Files: Tag: devel_0_39 SConscript Log Message: scons fixes for osx scons fixes for externals and pd as shared library
Index: SConscript =================================================================== RCS file: /cvsroot/pure-data/pd/extra/Attic/SConscript,v retrieving revision 1.1.2.2 retrieving revision 1.1.2.3 diff -C2 -d -r1.1.2.2 -r1.1.2.3 *** SConscript 16 Jul 2005 21:18:23 -0000 1.1.2.2 --- SConscript 4 Aug 2005 11:00:02 -0000 1.1.2.3 *************** *** 1,3 **** ! Import("pdenv")
extra_env = pdenv.Copy() --- 1,3 ---- ! Import("pdenv pdlib")
extra_env = pdenv.Copy() *************** *** 6,24 ****
if extra_env['PLATFORM'] == 'win32': - if ['msvc'] in pdenv['TOOLS']: - extra_env.Append(LINKFLAGS='src/pd.lib') - else: - extra_env.Append(LINKFLAGS='src/pd.dll') extra_env.Append(CPPDEFINES=Split("NT")) extra_env['SHLIBSUFFIX']='.dll' elif extra_env['PLATFORM'] == 'darwin': extra_env['SHLIBSUFFIX']='.pd_darwin' elif extra_env['PLATFORM'] == 'posix': extra_env['SHLIBSUFFIX']='.pd_linux'
extra_env.Append(CPPPATH='../src') extra_env.Append(CPPDEFINES='PD')
- extras = []
--- 6,24 ----
if extra_env['PLATFORM'] == 'win32': extra_env.Append(CPPDEFINES=Split("NT")) extra_env['SHLIBSUFFIX']='.dll' elif extra_env['PLATFORM'] == 'darwin': extra_env['SHLIBSUFFIX']='.pd_darwin' + extra_env['SHLINKFLAGS']="-bundle -undefined suppress -flat_namespace" elif extra_env['PLATFORM'] == 'posix': extra_env['SHLIBSUFFIX']='.pd_linux'
+ if pdlib != None: + extra_env.Append(LIBS='pd') + extra_env.Append(LIBPATH='../bin') + extra_env.Append(CPPPATH='../src') extra_env.Append(CPPDEFINES='PD')
extras = []
*************** *** 27,31 ****
for extra in Split("expr expr~ fexpr~"): ! extras.append(extra_env.SharedLibrary(extra, map(lambda x: 'expr~/'+x+'.c', Split("vexp vexp_fun vexp_if"))))
Default(extras) --- 27,32 ----
for extra in Split("expr expr~ fexpr~"): ! extras.append(extra_env.SharedLibrary(extra, map(lambda x: 'expr~/'+x+'.c',\ ! Split("vexp vexp_fun vexp_if"))))
Default(extras)