ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/rt/SConscript
(Generate patch)

Comparing ray/src/rt/SConscript (file contents):
Revision 1.17 by schorsch, Thu Mar 10 21:43:23 2016 UTC vs.
Revision 1.18 by schorsch, Fri Mar 18 22:58:46 2016 UTC

# Line 43 | Line 43 | env.Command('Version.c', 'VERSION', vstamp.build_versi
43   env.Depends('Version.c', rsrc)
44   Version = env.Object(source=['Version.c'])
45   env.version = Version # make it remotely accessible
46 < rlib = env.Library(target=radlib('rttrace'), source=rsrc + [Version])
46 > tracelib = env.Library(target=radlib('rttrace'), source=rsrc + [Version])
47  
48   rclib = env.Library(target=radlib('raycalls'),
49                  source=Split('raycalls.c $RAD_PCALLS'))
# Line 71 | Line 71 | for p in PROGS:
71          Default(prog)
72          env.Append(RAD_BININSTALL=[env.Install('$RAD_BINDIR', prog)])
73  
74 + # we need RVOBJS for any derived viewers, such as winrview
75 + if os.name == 'nt': RV_DEF = ['WIN_RVIEW']
76 + else: RV_DEF = []
77 + rvmain = env.Object(source='rvmain.c',
78 +                CCFLAGS=env['CCFLAGS'] + ['-DNICE=6'])
79 + rvobjs = [rvmain]
80 + for src in  Split('''rview.c rv2.c rv3.c
81 +        devtable.c devcomm.c colortab.c editline.c'''):
82 +        rvobjs.append(env.Object(source=src,
83 +                        CPPDEFINES=env.get('CPPDEFINES', []) + RV_DEF))
84 + env['RVOBJS'] = rvobjs
85  
86   if env.has_key('X11LIB'): # lots of special requirements for rvu
87          x11incls = [env['X11INCLUDE']] + env['CPPPATH']
88          x11 = env.Object(source='x11.c', CPPPATH=x11incls)
89          x11twind = env.Object(source='x11twind.c', CPPPATH=x11incls)
90 <        rvmain = env.Object(source='rvmain.c',
91 <                CCFLAGS=env['CCFLAGS'] + ['-DNICE=6'])
81 <        rv3 = env.Object(source='rv3.c',
82 <                CCFLAGS=env['CCFLAGS']
83 <                )
84 <
85 <        devsrc  = Split('devtable.c devcomm.c colortab.c editline.c')
86 <        rvobjs = [x11, x11twind, rv3, rvmain, rlib]
87 <        rvsrc = Split('rview.c rv2.c') + devsrc + rvobjs
90 >        rvxobjs = [x11, x11twind]
91 >        rvsrc =  rvobjs + rvxobjs
92          rvu = env.Program(target=radbin('rvu'), source=rvsrc,
93                  LIBPATH=env['LIBPATH'] + [env['X11LIB']],
94                  LIBS = ([rclib, 'rttrace', 'rtrad', 'X11'] + mlib)

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)