pd/extra SConscript,1.1.2.4,1.1.2.5 - Pd-cvs

8 Oct 2005


      Update of /cvsroot/pure-data/pd/extra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21561/extra
Modified Files:
      Tag: devel_0_39
    SConscript 
Log Message:
updated for Windows' exported setup functions
Index: SConscript
===================================================================
RCS file: /cvsroot/pure-data/pd/extra/Attic/SConscript,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** SConscript	7 Oct 2005 22:11:37 -0000	1.1.2.4
--- SConscript	8 Oct 2005 18:33:03 -0000	1.1.2.5
***************
*** 18,31 ****
extra_env.Append(CPPPATH='../src')
- extra_env.Append(CPPDEFINES='PD')
extras = []
for extra in Split("bonk~ choice fiddle~ loop~ lrshift~ pique"):
! 	extras.append(extra_env.SharedLibrary(extra, extra+'/'+extra+'.c'))
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)
--- 18,44 ----
extra_env.Append(CPPPATH='../src')
extras = []
+ def getlocalenv(env,name):
+ 	'''make environment with flags for exported setup function'''
+ 	loc_env = env.Copy()
+ 	if 'msvc' in pdenv['TOOLS']:
+ 		parts = name.split("~")
+ 		setup_name = parts[0]
+ 		if len(parts) > 1:
+ 			setup_name += "_tilde"
+ 		loc_env.Append(LINKFLAGS=["/EXPORT:"+setup_name+"_setup"])
+ 	return loc_env
+ 
  for extra in Split("bonk~ choice fiddle~ loop~ lrshift~ pique"):
! 	env = getlocalenv(extra_env,extra)
! 	extras.append(env.SharedLibrary(extra, extra+'/'+extra+'.c'))
! 
! exprfiles = map(lambda x: 'expr~/'+x+'.c',Split("vexp vexp_fun vexp_if"))
for extra in Split("expr expr~ fexpr~"):
! 	env = getlocalenv(extra_env,extra)
! 	extras.append(env.SharedLibrary(extra,exprfiles))
Default(extras)