/[ascend]/trunk/tcltk/generic/interface/SConscript
ViewVC logotype

Diff of /trunk/tcltk/generic/interface/SConscript

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 742 by johnpye, Wed Jun 21 07:57:19 2006 UTC revision 743 by johnpye, Thu Jul 6 14:22:26 2006 UTC
# Line 23  typelex = tcl_env.SharedObject(typelexso Line 23  typelex = tcl_env.SharedObject(typelexso
23  )  )
24    
25  if tcl_env.get('TCL_CPPPATH'):  if tcl_env.get('TCL_CPPPATH'):
26      tcl_env.Append(CPPPATH=tcl_env['TCL_CPPPATH'])      tcl_env.AppendUnique(CPPPATH=[tcl_env['TCL_CPPPATH']])
27    
28  if tcl_env.get('TK_CPPPATH'):  if tcl_env.get('TK_CPPPATH'):
29      tcl_env.Append(CPPPATH=tcl_env['TK_CPPPATH'])      tcl_env.AppendUnique(CPPPATH=[tcl_env['TK_CPPPATH']])
30    
31  tcl_env.Append(LIBS=['ascend'])  tcl_env.Append(LIBS=['ascend'])
32  tcl_env.Append(LIBPATH=['#'])  tcl_env.AppendUnique(LIBPATH=['#'])
33    
34  if tcl_env.get('STATIC_TCLTK'):  if tcl_env.get('STATIC_TCLTK'):
35      print "STATIC TCL/TK PROGRAM LINKAGE"      print "STATIC TCL/TK PROGRAM LINKAGE"
36      srcs += ['$TCL_LIB','$TK_LIB','$TKTABLE_LIB']      srcs += ['$TCL_LIB','$TK_LIB','$TKTABLE_LIB']
37      tcl_env.Append(LIBS=tcl_env['X11_LIB'])      tcl_env.AppendUnique(LIBS=[tcl_env['X11_LIB']])
38      tcl_env.Append(LIBPATH=tcl_env['X11_LIBPATH'])      tcl_env.AppendUnique(LIBPATH=[tcl_env['X11_LIBPATH']])
39    
40      if tcl_env['TKTABLE_LIBPATH']:      if tcl_env['TKTABLE_LIBPATH']:
41          tcl_env.Append(LIBPATH=tcl_env['TKTABLE_LIBPATH'])          tcl_env.Append(LIBPATH=tcl_env['TKTABLE_LIBPATH'])
# Line 47  else: Line 47  else:
47      tcl_env.Append(LIBS=tcl_env['TK_LIB'])      tcl_env.Append(LIBS=tcl_env['TK_LIB'])
48    
49      if tcl_env.has_key('TCL_LIBPATH'):      if tcl_env.has_key('TCL_LIBPATH'):
50          tcl_env.Append(LIBPATH=tcl_env['TCL_LIBPATH'])          tcl_env.AppendUnique(LIBPATH=[tcl_env['TCL_LIBPATH']])
51      if tcl_env.has_key('TK_LIBPATH'):      if tcl_env.has_key('TK_LIBPATH'):
52          tcl_env.Append(LIBPATH=tcl_env['TK_LIBPATH'])          tcl_env.AppendUnique(LIBPATH=[tcl_env['TK_LIBPATH']])
53    
54      ascendtcllib = tcl_env.SharedLibrary('ascendtcl',srcs+typelex)      ascendtcllib = tcl_env.SharedLibrary('ascendtcl',srcs+typelex)
55    
# Line 57  else: Line 57  else:
57      #tk_so = tcl_env.Command(Copy('$SHLIBPREFIX$TK_LIB$SHLIBSUFFIX','$TK_LIBPATH/$SHLIBPREFIX$TK_LIB$SHLIBSUFFIX'))      #tk_so = tcl_env.Command(Copy('$SHLIBPREFIX$TK_LIB$SHLIBSUFFIX','$TK_LIBPATH/$SHLIBPREFIX$TK_LIB$SHLIBSUFFIX'))
58      #tktable_so = tcl_env.Command(Copy('$SHLIBPREFIX$TKTABLE_LIB$SHLIBSUFFIX','$TKTABLE_LIBPATH/$SHLIBPREFIX$TKTABLE_LIB$SHLIBSUFFIX'))      #tktable_so = tcl_env.Command(Copy('$SHLIBPREFIX$TKTABLE_LIB$SHLIBSUFFIX','$TKTABLE_LIBPATH/$SHLIBPREFIX$TKTABLE_LIB$SHLIBSUFFIX'))
59    
60      tcl_env.Append(LIBPATH=['.'])      tcl_env.Prepend(LIBPATH=['.'])
61    
62      ascendtclprog = tcl_env.Program("ascend4",["main.c"]      ascendtclprog = tcl_env.Program("ascend4",["main.c"]
63          , LIBS = tcl_env['LIBS']+['ascendtcl','ascend']          , LIBS = tcl_env['LIBS']+['ascendtcl','ascend']

Legend:
Removed from v.742  
changed lines
  Added in v.743

john.pye@anu.edu.au
ViewVC Help
Powered by ViewVC 1.1.22