Revision: 41914
http://brlcad.svn.sourceforge.net/brlcad/?rev=41914&view=rev
Author: starseeker
Date: 2011-01-04 14:30:43 +0000 (Tue, 04 Jan 2011)
Log Message:
-----------
Hmm. Looks like the CMake logic for liboptical/libmultispectral is
significantly different than autotools in some fashion. This set of changes
gets things working in trunk with regression test passing - need to reexamine
the liboptical CMake build in detail.
Modified Paths:
--------------
brlcad/trunk/include/optical.h
brlcad/trunk/src/libmultispectral/init.c
brlcad/trunk/src/liboptical/refract.c
brlcad/trunk/src/liboptical/sh_camo.c
brlcad/trunk/src/liboptical/sh_light.c
brlcad/trunk/src/liboptical/sh_plastic.c
brlcad/trunk/src/rt/ext.h
Modified: brlcad/trunk/include/optical.h
===================================================================
--- brlcad/trunk/include/optical.h 2011-01-04 14:00:23 UTC (rev 41913)
+++ brlcad/trunk/include/optical.h 2011-01-04 14:30:43 UTC (rev 41914)
@@ -85,6 +85,13 @@
/* defined in vers.c */
OPTICAL_EXPORT extern const char *optical_version(void);
+/* for libmultispectral */
+OPTICAL_EXPORT extern struct mfuncs camo_mfuncs[];
+OPTICAL_EXPORT extern struct mfuncs light_mfuncs[];
+OPTICAL_EXPORT extern struct mfuncs stk_mfuncs[];
+OPTICAL_EXPORT extern struct mfuncs phg_mfuncs[];
+OPTICAL_EXPORT extern struct mfuncs noise_mfuncs[];
+OPTICAL_EXPORT extern struct bn_table *spectrum;
OPTICAL_EXPORT extern int rdebug;
Modified: brlcad/trunk/src/libmultispectral/init.c
===================================================================
--- brlcad/trunk/src/libmultispectral/init.c 2011-01-04 14:00:23 UTC (rev
41913)
+++ brlcad/trunk/src/libmultispectral/init.c 2011-01-04 14:30:43 UTC (rev
41914)
@@ -37,6 +37,7 @@
#include "shadefuncs.h"
#include "shadework.h"
#include "rtprivate.h"
+#include "optical.h"
#define MFUNCS(_name) \
Modified: brlcad/trunk/src/liboptical/refract.c
===================================================================
--- brlcad/trunk/src/liboptical/refract.c 2011-01-04 14:00:23 UTC (rev
41913)
+++ brlcad/trunk/src/liboptical/refract.c 2011-01-04 14:30:43 UTC (rev
41914)
@@ -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/trunk/src/liboptical/sh_camo.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_camo.c 2011-01-04 14:00:23 UTC (rev
41913)
+++ brlcad/trunk/src/liboptical/sh_camo.c 2011-01-04 14:30:43 UTC (rev
41914)
@@ -44,7 +44,6 @@
#ifdef RT_MULTISPECTRAL
# include "spectrum.h"
-extern const struct bn_table *spectrum;
#endif
#if !defined(M_PI)
Modified: brlcad/trunk/src/liboptical/sh_light.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_light.c 2011-01-04 14:00:23 UTC (rev
41913)
+++ brlcad/trunk/src/liboptical/sh_light.c 2011-01-04 14:30:43 UTC (rev
41914)
@@ -39,7 +39,6 @@
#ifdef RT_MULTISPECTRAL
# include "spectrum.h"
-extern const struct bn_table *spectrum;
#endif
Modified: brlcad/trunk/src/liboptical/sh_plastic.c
===================================================================
--- brlcad/trunk/src/liboptical/sh_plastic.c 2011-01-04 14:00:23 UTC (rev
41913)
+++ brlcad/trunk/src/liboptical/sh_plastic.c 2011-01-04 14:30:43 UTC (rev
41914)
@@ -41,7 +41,6 @@
#ifdef RT_MULTISPECTRAL
# include "spectrum.h"
-extern const struct bn_table *spectrum;
#endif
Modified: brlcad/trunk/src/rt/ext.h
===================================================================
--- brlcad/trunk/src/rt/ext.h 2011-01-04 14:00:23 UTC (rev 41913)
+++ brlcad/trunk/src/rt/ext.h 2011-01-04 14:30:43 UTC (rev 41914)
@@ -27,10 +27,7 @@
*
*/
-/***** Variables declared in liboptical or multispectral *****/
-#ifdef RT_MULTISPECTRAL
-extern const struct bn_table *spectrum;
-#endif /* RT_MULTISPECTRAL */
+#include "optical.h"
/***** Variables declared in opt.c *****/
extern char *framebuffer; /* desired framebuffer */
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
