ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/devtable.c
(Generate patch)

Comparing ray/src/rt/devtable.c (file contents):
Revision 2.5 by greg, Tue Feb 25 02:47:22 2003 UTC vs.
Revision 2.8 by greg, Wed Oct 5 17:20:55 2011 UTC

# Line 7 | Line 7 | static const char      RCSid[] = "$Id$";
7  
8   #include "copyright.h"
9  
10 < #include  "color.h"
10 > #include  <stdio.h>
11  
12 + #include  "color.h"
13   #include  "driver.h"
14  
15 + #if !defined(HAS_X11) && !defined(HAS_QT)
16 + #define HAS_X11
17 + #endif
18 +
19 + #ifdef HAS_X11
20 + extern dr_initf_t x11_init;
21   char  dev_default[] = "x11";
22 + #else
23 + char  dev_default[] = "qt";
24 + #endif
25  
26 < extern struct driver  *x11_init();
26 > #ifdef HAS_QT
27 > extern dr_initf_t qt_init;
28 > #endif
29  
30   struct device  devtable[] = {                   /* supported devices */
31          {"slave", "Slave driver", slave_init},
32 + #ifdef HAS_X11
33          {"x11", "X11 color or greyscale display", x11_init},
34          {"x11d", "X11 display using stdin/stdout", x11_init},
35 + #endif
36 + #ifdef HAS_QT
37 +        {"qt", "QT display", qt_init},
38 + #endif
39          {0}                                     /* terminator */
40   };

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines