Revision: 41521
http://brlcad.svn.sourceforge.net/brlcad/?rev=41521&view=rev
Author: starseeker
Date: 2010-12-06 22:30:23 +0000 (Mon, 06 Dec 2010)
Log Message:
-----------
Update cmake branch to trunk r41520
Modified Paths:
--------------
brlcad/branches/cmake/TODO
brlcad/branches/cmake/bench/pixcmp.c
brlcad/branches/cmake/bench/run.sh
brlcad/branches/cmake/include/bn.h
brlcad/branches/cmake/misc/win32-msvc8/brlcad/brlcad.sln
brlcad/branches/cmake/src/libbu/parse.c
brlcad/branches/cmake/src/tclscripts/archer/CombEditFrame.tcl
Added Paths:
-----------
brlcad/branches/cmake/misc/win32-msvc8/pixcmp/
brlcad/branches/cmake/misc/win32-msvc8/pixcmp/pixcmp.vcproj
Removed Paths:
-------------
brlcad/branches/cmake/misc/win32-msvc8/pixcmp/pixcmp.vcproj
Modified: brlcad/branches/cmake/TODO
===================================================================
--- brlcad/branches/cmake/TODO 2010-12-06 22:27:52 UTC (rev 41520)
+++ brlcad/branches/cmake/TODO 2010-12-06 22:30:23 UTC (rev 41521)
@@ -19,9 +19,7 @@
* make sure 'preview' works, particularly the 'tree' subcommand.
-* verify rt/benchmark on windows doesn't crash
-
THESE TASKS SHOULD HAPPEN WITHIN TWO RELEASE ITERATIONS
-------------------------------------------------------
Modified: brlcad/branches/cmake/bench/pixcmp.c
===================================================================
--- brlcad/branches/cmake/bench/pixcmp.c 2010-12-06 22:27:52 UTC (rev
41520)
+++ brlcad/branches/cmake/bench/pixcmp.c 2010-12-06 22:30:23 UTC (rev
41521)
@@ -152,8 +152,8 @@
exit(OPTS_ERROR);
}
}
- argc -= optind;
- argv += optind;
+ argc -= bu_optind;
+ argv += bu_optind;
/* validate what is left over */
if (argc < 1 || argc > 4) {
@@ -188,7 +188,7 @@
if (strcmp(argv[0], "-") == 0) {
f1 = stdin;
} else if ((f1 = fopen(argv[0], "rb")) == NULL) {
- perror(argv[1]);
+ perror(argv[0]);
exit(FILE_ERROR);
}
if ((argc < 2) || (strcmp(argv[1], "-") == 0)) {
Modified: brlcad/branches/cmake/bench/run.sh
===================================================================
--- brlcad/branches/cmake/bench/run.sh 2010-12-06 22:27:52 UTC (rev 41520)
+++ brlcad/branches/cmake/bench/run.sh 2010-12-06 22:30:23 UTC (rev 41521)
@@ -496,6 +496,7 @@
${PATH_TO_THIS}/../src/rt/rt \
${PATH_TO_THIS}/src/rt/rt \
./rt \
+ ../brlcadInstall/bin/rt.exe \
../src/rt/rt
look_for file "a benchmark geometry directory" DB \
@@ -508,6 +509,7 @@
${PATH_TO_THIS}/../db/moss.g \
${PATH_TO_THIS}/db/moss.g \
./db/moss.g \
+ ../brlcadInstall/share/brlcad/*.*.*/db/moss.g \
../db/moss.g
DB=`echo $DB | sed 's,/moss.g$,,'`
@@ -538,6 +540,7 @@
${PATH_TO_THIS}/pixcmp \
${PATH_TO_THIS}/../bin/pixcmp \
${PATH_TO_THIS}/../bench/pixcmp \
+ ../brlcadInstall/bin/pixcmp.exe \
./pixcmp
look_for script "a time elapsed utility" ELP \
@@ -598,7 +601,13 @@
$ECHO "ERROR: RT does not seem to work as expected"
exit 2
fi
-$CMP /dev/null /dev/null >/dev/null 2>&1
+
+# create a temporary file named "null", fopen("/dev/null") does not work on
+# windows (using cygwin), so punt.
+> null
+$CMP null null >/dev/null 2>&1
+rm -f null
+
ret=$?
if test ! "x${ret}" = "x0" ; then
$ECHO
@@ -1146,15 +1155,23 @@
perf_have_dc=no
fi
+ perf_have_bc=yes
+ echo "1 + 1" | bc >/dev/null 2>&1
+ if test ! x$? = x0 ; then
+ perf_have_bc=no
+ fi
+
for perf_ref in $perf_VGRREF ; do
perf_cur=$1
shift
if test "x$perf_have_dc" = "xyes" ; then
perf_RATIO=`echo "2k $perf_cur $perf_ref / p" | dc`
- else
+ elif test "x$perf_have_bc" = "xyes" ; then
# presume bc as an alternate (tsk tsk)
perf_RATIO=`echo "scale=2; $perf_cur / $perf_ref" | bc`
+ else
+ perf_RATIO=`echo $perf_cur $perf_ref | awk '{printf "%.2f", $1/$2}'`
fi
# Note: append new value and a trail TAB to existing list.
perf_RATIO_LIST="${perf_RATIO_LIST}$perf_RATIO "
@@ -1164,7 +1181,7 @@
if test "x$perf_have_dc" = "xyes" ; then
perf_MEAN_ABS=`echo 2k $perf_CURVALS +++++ 6/ p | dc`
perf_MEAN_REL=`echo 2k $perf_RATIO_LIST +++++ 6/ p | dc`
- else
+ elif test "x$perf_have_bc" = "xyes" ; then
perf_expr="scale=2; ( 0"
for perf_val in $perf_CURVALS ; do
perf_expr="$perf_expr + $perf_val"
@@ -1178,6 +1195,9 @@
done
perf_expr="$perf_expr ) / 6"
perf_MEAN_REL=`echo $perf_expr | bc`
+ else
+ perf_MEAN_ABS=`echo $perf_CURVALS | awk '{printf "%.2f",
($1+$2+$3+$4+$5+$6)/6}'`
+ perf_MEAN_REL=`echo $perf_RATIO_LIST | awk '{printf "%.2f",
($1+$2+$3+$4+$5+$6)/6}'`
fi
# Note: Both perf_RATIO_LIST and perf_CURVALS have an extra
Modified: brlcad/branches/cmake/include/bn.h
===================================================================
--- brlcad/branches/cmake/include/bn.h 2010-12-06 22:27:52 UTC (rev 41520)
+++ brlcad/branches/cmake/include/bn.h 2010-12-06 22:30:23 UTC (rev 41521)
@@ -112,7 +112,8 @@
#define BN_CK_TOL(_p) BU_CKMAG(_p, BN_TOL_MAGIC, "bn_tol")
#define BN_VECT_ARE_PARALLEL(_dot, _tol) \
- (((_dot) < 0) ? ((-(_dot))>=(_tol)->para) : ((_dot) >= (_tol)->para))
+ (((_dot) <= -SMALL_FASTF) ? (NEAR_ZERO((_dot) + 1.0, (_tol)->perp)) :
(NEAR_ZERO((_dot) - 1.0, (_tol)->perp)))
+
#define BN_VECT_ARE_PERP(_dot, _tol) \
(((_dot) < 0) ? ((-(_dot))<=(_tol)->perp) : ((_dot) <= (_tol)->perp))
Modified: brlcad/branches/cmake/misc/win32-msvc8/brlcad/brlcad.sln
===================================================================
--- brlcad/branches/cmake/misc/win32-msvc8/brlcad/brlcad.sln 2010-12-06
22:27:52 UTC (rev 41520)
+++ brlcad/branches/cmake/misc/win32-msvc8/brlcad/brlcad.sln 2010-12-06
22:30:23 UTC (rev 41521)
@@ -1872,6 +1872,12 @@
Release.AspNetCompiler.Debug = "False"
EndProjectSection
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pixcmp",
"..\pixcmp\pixcmp.vcproj", "{8AAF9606-7C95-4BB1-8EB7-DDD3304D03C1}"
+ ProjectSection(WebsiteProperties) = preProject
+ Debug.AspNetCompiler.Debug = "True"
+ Release.AspNetCompiler.Debug = "False"
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Release|Win32 = Release|Win32
@@ -2602,6 +2608,10 @@
{43DF8660-74E7-4371-BEC3-602E2E6481B5}.Release|Win32.Build.0 =
Release|Win32
{43DF8660-74E7-4371-BEC3-602E2E6481B5}.Release|x64.ActiveCfg =
Release|x64
{43DF8660-74E7-4371-BEC3-602E2E6481B5}.Release|x64.Build.0 =
Release|x64
+ {8AAF9606-7C95-4BB1-8EB7-DDD3304D03C1}.Release|Win32.ActiveCfg
= Release|Win32
+ {8AAF9606-7C95-4BB1-8EB7-DDD3304D03C1}.Release|Win32.Build.0 =
Release|Win32
+ {8AAF9606-7C95-4BB1-8EB7-DDD3304D03C1}.Release|x64.ActiveCfg =
Release|x64
+ {8AAF9606-7C95-4BB1-8EB7-DDD3304D03C1}.Release|x64.Build.0 =
Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Deleted: brlcad/branches/cmake/misc/win32-msvc8/pixcmp/pixcmp.vcproj
===================================================================
--- brlcad/trunk/misc/win32-msvc8/pixcmp/pixcmp.vcproj 2010-12-06 22:07:33 UTC
(rev 41519)
+++ brlcad/branches/cmake/misc/win32-msvc8/pixcmp/pixcmp.vcproj 2010-12-06
22:30:23 UTC (rev 41521)
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioProject
- ProjectType="Visual C++"
- Version="8.00"
- Name="pixcmp"
- ProjectGUID="{8AAF9606-7C95-4BB1-8EB7-DDD3304D03C1}"
- RootNamespace="pixcmp"
- >
- <Platforms>
- <Platform
- Name="Win32"
- />
- <Platform
- Name="x64"
- />
- </Platforms>
- <ToolFiles>
- </ToolFiles>
- <Configurations>
- <Configuration
- Name="Release|Win32"
- OutputDirectory=".\$(PlatformName)\$(ConfigurationName)"
-
IntermediateDirectory=".\$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
-
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
-
TypeLibraryName=".\$(PlatformName)\$(ConfigurationName)/pixcmp.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
-
AdditionalIncludeDirectories="../../../include;../../../src/other/tcl/generic"
-
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;_CRT_SECURE_NO_WARNINGS"
- StringPooling="true"
- BasicRuntimeChecks="0"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- TreatWChar_tAsBuiltInType="false"
- UsePrecompiledHeader="0"
-
PrecompiledHeaderFile=".\$(PlatformName)\$(ConfigurationName)/pixcmp.pch"
-
AssemblerListingLocation=".\$(PlatformName)\$(ConfigurationName)/"
-
ObjectFile=".\$(PlatformName)\$(ConfigurationName)/"
-
ProgramDataBaseFileName=".\$(PlatformName)\$(ConfigurationName)/"
- WarningLevel="4"
- SuppressStartupBanner="true"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="0"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="libbu.lib"
-
OutputFile="$(PlatformName)\$(ConfigurationName)/pixcmp.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
-
AdditionalLibraryDirectories="../../../brlcadInstall/lib"
- GenerateDebugInformation="false"
-
ProgramDatabaseFile=".\$(PlatformName)\$(ConfigurationName)/pixcmp.pdb"
- SubSystem="1"
- TargetMachine="1"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="copy "$(TargetPath)"
..\..\..\brlcadInstall\bin"
- />
- </Configuration>
- <Configuration
- Name="Release|x64"
- OutputDirectory="$(PlatformName)\$(ConfigurationName)"
-
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
- ConfigurationType="1"
-
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
- UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="false"
- CharacterSet="2"
- >
- <Tool
- Name="VCPreBuildEventTool"
- />
- <Tool
- Name="VCCustomBuildTool"
- />
- <Tool
- Name="VCXMLDataGeneratorTool"
- />
- <Tool
- Name="VCWebServiceProxyGeneratorTool"
- />
- <Tool
- Name="VCMIDLTool"
- TargetEnvironment="3"
-
TypeLibraryName=".\$(PlatformName)\$(ConfigurationName)/pixcmp.tlb"
- HeaderFileName=""
- />
- <Tool
- Name="VCCLCompilerTool"
- Optimization="2"
- InlineFunctionExpansion="1"
-
AdditionalIncludeDirectories="../../../include;../../../src/other/tcl/generic"
-
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;_CRT_SECURE_NO_WARNINGS"
- StringPooling="true"
- BasicRuntimeChecks="0"
- RuntimeLibrary="2"
- EnableFunctionLevelLinking="true"
- TreatWChar_tAsBuiltInType="false"
- UsePrecompiledHeader="0"
-
PrecompiledHeaderFile=".\$(PlatformName)\$(ConfigurationName)/pixcmp.pch"
-
AssemblerListingLocation=".\$(PlatformName)\$(ConfigurationName)/"
-
ObjectFile=".\$(PlatformName)\$(ConfigurationName)/"
-
ProgramDataBaseFileName=".\$(PlatformName)\$(ConfigurationName)/"
- WarningLevel="3"
- SuppressStartupBanner="true"
- Detect64BitPortabilityProblems="true"
- DebugInformationFormat="0"
- CompileAs="0"
- />
- <Tool
- Name="VCManagedResourceCompilerTool"
- />
- <Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="1033"
- />
- <Tool
- Name="VCPreLinkEventTool"
- />
- <Tool
- Name="VCLinkerTool"
- AdditionalDependencies="libbu.lib"
-
OutputFile="$(PlatformName)\$(ConfigurationName)/pixcmp.exe"
- LinkIncremental="1"
- SuppressStartupBanner="true"
-
AdditionalLibraryDirectories="../../../brlcadInstall$(PlatformName)/lib"
- GenerateDebugInformation="false"
-
ProgramDatabaseFile=".\$(PlatformName)\$(ConfigurationName)/pixcmp.pdb"
- SubSystem="1"
- TargetMachine="17"
- />
- <Tool
- Name="VCALinkTool"
- />
- <Tool
- Name="VCManifestTool"
- />
- <Tool
- Name="VCXDCMakeTool"
- />
- <Tool
- Name="VCBscMakeTool"
- />
- <Tool
- Name="VCFxCopTool"
- />
- <Tool
- Name="VCAppVerifierTool"
- />
- <Tool
- Name="VCWebDeploymentTool"
- />
- <Tool
- Name="VCPostBuildEventTool"
- CommandLine="copy "$(TargetPath)"
..\..\..\brlcadInstall$(PlatformName)\bin"
- />
- </Configuration>
- </Configurations>
- <References>
- </References>
- <Files>
- <Filter
- Name="Source Files"
-
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
- >
- <File
- RelativePath="..\..\..\bench\pixcmp.c"
- >
- </File>
- </Filter>
- <Filter
- Name="Header Files"
- Filter="h;hpp;hxx;hm;inl;fi;fd"
- >
- </Filter>
- <Filter
- Name="Resource Files"
-
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
- >
- </Filter>
- </Files>
- <Globals>
- </Globals>
-</VisualStudioProject>
Copied: brlcad/branches/cmake/misc/win32-msvc8/pixcmp/pixcmp.vcproj (from rev
41519, brlcad/trunk/misc/win32-msvc8/pixcmp/pixcmp.vcproj)
===================================================================
--- brlcad/branches/cmake/misc/win32-msvc8/pixcmp/pixcmp.vcproj
(rev 0)
+++ brlcad/branches/cmake/misc/win32-msvc8/pixcmp/pixcmp.vcproj 2010-12-06
22:30:23 UTC (rev 41521)
@@ -0,0 +1,243 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+ ProjectType="Visual C++"
+ Version="8.00"
+ Name="pixcmp"
+ ProjectGUID="{8AAF9606-7C95-4BB1-8EB7-DDD3304D03C1}"
+ RootNamespace="pixcmp"
+ >
+ <Platforms>
+ <Platform
+ Name="Win32"
+ />
+ <Platform
+ Name="x64"
+ />
+ </Platforms>
+ <ToolFiles>
+ </ToolFiles>
+ <Configurations>
+ <Configuration
+ Name="Release|Win32"
+ OutputDirectory=".\$(PlatformName)\$(ConfigurationName)"
+
IntermediateDirectory=".\$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+
TypeLibraryName=".\$(PlatformName)\$(ConfigurationName)/pixcmp.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+
AdditionalIncludeDirectories="../../../include;../../../src/other/tcl/generic"
+
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;_CRT_SECURE_NO_WARNINGS"
+ StringPooling="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ TreatWChar_tAsBuiltInType="false"
+ UsePrecompiledHeader="0"
+
PrecompiledHeaderFile=".\$(PlatformName)\$(ConfigurationName)/pixcmp.pch"
+
AssemblerListingLocation=".\$(PlatformName)\$(ConfigurationName)/"
+
ObjectFile=".\$(PlatformName)\$(ConfigurationName)/"
+
ProgramDataBaseFileName=".\$(PlatformName)\$(ConfigurationName)/"
+ WarningLevel="4"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libbu.lib"
+
OutputFile="$(PlatformName)\$(ConfigurationName)/pixcmp.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+
AdditionalLibraryDirectories="../../../brlcadInstall/lib"
+ GenerateDebugInformation="false"
+
ProgramDatabaseFile=".\$(PlatformName)\$(ConfigurationName)/pixcmp.pdb"
+ SubSystem="1"
+ TargetMachine="1"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy "$(TargetPath)"
..\..\..\brlcadInstall\bin"
+ />
+ </Configuration>
+ <Configuration
+ Name="Release|x64"
+ OutputDirectory="$(PlatformName)\$(ConfigurationName)"
+
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
+ ConfigurationType="1"
+
InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
+ UseOfMFC="0"
+ ATLMinimizesCRunTimeLibraryUsage="false"
+ CharacterSet="2"
+ >
+ <Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TargetEnvironment="3"
+
TypeLibraryName=".\$(PlatformName)\$(ConfigurationName)/pixcmp.tlb"
+ HeaderFileName=""
+ />
+ <Tool
+ Name="VCCLCompilerTool"
+ Optimization="2"
+ InlineFunctionExpansion="1"
+
AdditionalIncludeDirectories="../../../include;../../../src/other/tcl/generic"
+
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;__win32;BRLCAD_DLL;HAVE_CONFIG_H;BRLCADBUILD;_CRT_SECURE_NO_WARNINGS"
+ StringPooling="true"
+ BasicRuntimeChecks="0"
+ RuntimeLibrary="2"
+ EnableFunctionLevelLinking="true"
+ TreatWChar_tAsBuiltInType="false"
+ UsePrecompiledHeader="0"
+
PrecompiledHeaderFile=".\$(PlatformName)\$(ConfigurationName)/pixcmp.pch"
+
AssemblerListingLocation=".\$(PlatformName)\$(ConfigurationName)/"
+
ObjectFile=".\$(PlatformName)\$(ConfigurationName)/"
+
ProgramDataBaseFileName=".\$(PlatformName)\$(ConfigurationName)/"
+ WarningLevel="3"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ DebugInformationFormat="0"
+ CompileAs="0"
+ />
+ <Tool
+ Name="VCManagedResourceCompilerTool"
+ />
+ <Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
+ Name="VCLinkerTool"
+ AdditionalDependencies="libbu.lib"
+
OutputFile="$(PlatformName)\$(ConfigurationName)/pixcmp.exe"
+ LinkIncremental="1"
+ SuppressStartupBanner="true"
+
AdditionalLibraryDirectories="../../../brlcadInstall$(PlatformName)/lib"
+ GenerateDebugInformation="false"
+
ProgramDatabaseFile=".\$(PlatformName)\$(ConfigurationName)/pixcmp.pdb"
+ SubSystem="1"
+ TargetMachine="17"
+ />
+ <Tool
+ Name="VCALinkTool"
+ />
+ <Tool
+ Name="VCManifestTool"
+ />
+ <Tool
+ Name="VCXDCMakeTool"
+ />
+ <Tool
+ Name="VCBscMakeTool"
+ />
+ <Tool
+ Name="VCFxCopTool"
+ />
+ <Tool
+ Name="VCAppVerifierTool"
+ />
+ <Tool
+ Name="VCWebDeploymentTool"
+ />
+ <Tool
+ Name="VCPostBuildEventTool"
+ CommandLine="copy "$(TargetPath)"
..\..\..\brlcadInstall$(PlatformName)\bin"
+ />
+ </Configuration>
+ </Configurations>
+ <References>
+ </References>
+ <Files>
+ <Filter
+ Name="Source Files"
+
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
+ >
+ <File
+ RelativePath="..\..\..\bench\pixcmp.c"
+ >
+ </File>
+ </Filter>
+ <Filter
+ Name="Header Files"
+ Filter="h;hpp;hxx;hm;inl;fi;fd"
+ >
+ </Filter>
+ <Filter
+ Name="Resource Files"
+
Filter="ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
+ >
+ </Filter>
+ </Files>
+ <Globals>
+ </Globals>
+</VisualStudioProject>
Modified: brlcad/branches/cmake/src/libbu/parse.c
===================================================================
--- brlcad/branches/cmake/src/libbu/parse.c 2010-12-06 22:27:52 UTC (rev
41520)
+++ brlcad/branches/cmake/src/libbu/parse.c 2010-12-06 22:30:23 UTC (rev
41521)
@@ -768,7 +768,11 @@
retval = _bu_parse_double(value, sdp->sp_count, (double *)loc);
break;
case 'p':
- retval = _bu_struct_lookup((struct bu_structparse
*)sdp->sp_count, name, base, value);
+ if((retval = _bu_struct_lookup((struct bu_structparse
*)sdp->sp_count, name, base, value)) == 0) {
+ return retval;
+ } else {
+ continue;
+ }
break;
default:
bu_log("_bu_struct_lookup(%s): unknown format '%s'\n",
Modified: brlcad/branches/cmake/src/tclscripts/archer/CombEditFrame.tcl
===================================================================
--- brlcad/branches/cmake/src/tclscripts/archer/CombEditFrame.tcl
2010-12-06 22:27:52 UTC (rev 41520)
+++ brlcad/branches/cmake/src/tclscripts/archer/CombEditFrame.tcl
2010-12-06 22:30:23 UTC (rev 41521)
@@ -881,15 +881,15 @@
($_type == 1 && 6 <= $col && $col <= 8)} {
$itk_component(combMembersMenu) add command \
-label "Set Keypoint (View Center)" \
- -command [::itcl::code $this setKeypointVC $tname $row 5]
+ -command [::itcl::code $this setKeypointVC $tname $row 6]
} elseif {$_type == 2 && 3 <= $col && $col <= 5} {
$itk_component(combMembersMenu) add command \
-label "Set Keypoint (View Center)" \
- -command [::itcl::code $this setKeypointVC $tname $row 2]
+ -command [::itcl::code $this setKeypointVC $tname $row 3]
} elseif {$_type == 4 && 7 <= $col && $col <= 9} {
$itk_component(combMembersMenu) add command \
-label "Set Keypoint (View Center)" \
- -command [::itcl::code $this setKeypointVC $tname $row 6]
+ -command [::itcl::code $this setKeypointVC $tname $row 7]
}
addMemberCreationMenuEntries $_type $row
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
What happens now with your Lotus Notes apps - do you make another costly
upgrade, or settle for being marooned without product support? Time to move
off Lotus Notes and onto the cloud with Force.com, apps are easier to build,
use, and manage than apps on traditional platforms. Sign up for the Lotus
Notes Migration Kit to learn more. http://p.sf.net/sfu/salesforce-d2d
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
