Revision: 41912
http://brlcad.svn.sourceforge.net/brlcad/?rev=41912&view=rev
Author: starseeker
Date: 2011-01-04 04:17:08 +0000 (Tue, 04 Jan 2011)
Log Message:
-----------
This may not be the whole story, but clearly this was wrong - generalize
gencolor call in shaders.h
Modified Paths:
--------------
brlcad/branches/cmake/regress/CMakeLists.txt
brlcad/branches/cmake/regress/shaders.sh
Modified: brlcad/branches/cmake/regress/CMakeLists.txt
===================================================================
--- brlcad/branches/cmake/regress/CMakeLists.txt 2011-01-04 02:18:29 UTC
(rev 41911)
+++ brlcad/branches/cmake/regress/CMakeLists.txt 2011-01-04 04:17:08 UTC
(rev 41912)
@@ -18,7 +18,7 @@
)
ADD_CUSTOM_TARGET(shaders-regress
${SH_EXEC} ${CMAKE_SOURCE_DIR}/regress/shaders.sh
${CMAKE_SOURCE_DIR}
- DEPENDS rt mged pixdiff asc2pix
+ DEPENDS rt mged pixdiff asc2pix gencolor
)
ADD_CUSTOM_TARGET(spdi-regress
${SH_EXEC} ${CMAKE_SOURCE_DIR}/regress/spdi.sh
${CMAKE_SOURCE_DIR}
Modified: brlcad/branches/cmake/regress/shaders.sh
===================================================================
--- brlcad/branches/cmake/regress/shaders.sh 2011-01-04 02:18:29 UTC (rev
41911)
+++ brlcad/branches/cmake/regress/shaders.sh 2011-01-04 04:17:08 UTC (rev
41912)
@@ -66,13 +66,19 @@
exit 1
fi
+GENCOLOR="`ensearch gencolor`"
+if test ! -f "$GENCOLOR" ; then
+ echo "Unable to find gencolor, aborting"
+ exit 1
+fi
+
EAGLECAD=eagleCAD-512x438.pix
rm -f shaders.rt shaders.g shaders.rt.pix shaders.pixdiff.log shaders.rt.log
shaders.log shaders.txt shaders.dat $EAGLECAD shaders.mged
TOP_SRCDIR=$1
if [ ! -f ebm.bw ] ; then
- ../src/util/gencolor -r205 0 16 32 64 128 | dd of=ebm.bw bs=1024 count=1
+ $GENCOLOR -r205 0 16 32 64 128 | dd of=ebm.bw bs=1024 count=1
fi
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
