Revision: 41915
http://brlcad.svn.sourceforge.net/brlcad/?rev=41915&view=rev
Author: starseeker
Date: 2011-01-04 14:50:24 +0000 (Tue, 04 Jan 2011)
Log Message:
-----------
Sync cmake branch to trunk r41914
Modified Paths:
--------------
brlcad/branches/cmake/src/liboptical/refract.c
brlcad/branches/cmake/src/liboptical/sh_camo.c
brlcad/branches/cmake/src/liboptical/sh_light.c
brlcad/branches/cmake/src/liboptical/sh_plastic.c
brlcad/branches/cmake/src/rt/ext.h
Modified: brlcad/branches/cmake/src/liboptical/refract.c
===================================================================
--- brlcad/branches/cmake/src/liboptical/refract.c 2011-01-04 14:30:43 UTC
(rev 41914)
+++ brlcad/branches/cmake/src/liboptical/refract.c 2011-01-04 14:50:24 UTC
(rev 41915)
@@ -49,7 +49,7 @@
#ifdef RT_MULTISPECTRAL
-extern const struct bn_table *spectrum;
+#include "spectrum.h"
extern struct bn_tabdata *background;
#else
extern vect_t background;
Modified: brlcad/branches/cmake/src/liboptical/sh_camo.c
===================================================================
--- brlcad/branches/cmake/src/liboptical/sh_camo.c 2011-01-04 14:30:43 UTC
(rev 41914)
+++ brlcad/branches/cmake/src/liboptical/sh_camo.c 2011-01-04 14:50:24 UTC
(rev 41915)
@@ -44,7 +44,6 @@
#ifdef RT_MULTISPECTRAL
# include "spectrum.h"
-extern const struct bn_table *spectrum;
#endif
#if !defined(M_PI)
Modified: brlcad/branches/cmake/src/liboptical/sh_light.c
===================================================================
--- brlcad/branches/cmake/src/liboptical/sh_light.c 2011-01-04 14:30:43 UTC
(rev 41914)
+++ brlcad/branches/cmake/src/liboptical/sh_light.c 2011-01-04 14:50:24 UTC
(rev 41915)
@@ -39,7 +39,6 @@
#ifdef RT_MULTISPECTRAL
# include "spectrum.h"
-extern const struct bn_table *spectrum;
#endif
Modified: brlcad/branches/cmake/src/liboptical/sh_plastic.c
===================================================================
--- brlcad/branches/cmake/src/liboptical/sh_plastic.c 2011-01-04 14:30:43 UTC
(rev 41914)
+++ brlcad/branches/cmake/src/liboptical/sh_plastic.c 2011-01-04 14:50:24 UTC
(rev 41915)
@@ -41,7 +41,6 @@
#ifdef RT_MULTISPECTRAL
# include "spectrum.h"
-extern const struct bn_table *spectrum;
#endif
Modified: brlcad/branches/cmake/src/rt/ext.h
===================================================================
--- brlcad/branches/cmake/src/rt/ext.h 2011-01-04 14:30:43 UTC (rev 41914)
+++ brlcad/branches/cmake/src/rt/ext.h 2011-01-04 14:50:24 UTC (rev 41915)
@@ -26,6 +26,7 @@
* Michael John Muuss
*
*/
+
#include "optical.h"
/***** Variables declared in opt.c *****/
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
