[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Toon-members] tag build/vc2008/tag.sln build/vc2008/tag.vcpro...
|
From: |
Gerhard Reitmayr |
|
Subject: |
[Toon-members] tag build/vc2008/tag.sln build/vc2008/tag.vcpro... |
|
Date: |
Wed, 05 Aug 2009 14:18:43 +0000 |
CVSROOT: /cvsroot/toon
Module name: tag
Changes by: Gerhard Reitmayr <gerhard> 09/08/05 14:18:43
Modified files:
build/vc2008 : tag.sln tag.vcproj
tag : ransac.h
Added files:
build : install.bat
Log message:
- update to build system to include an install project
- added drand48 implementation for Win32
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/tag/build/vc2008/tag.sln?cvsroot=toon&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/tag/build/vc2008/tag.vcproj?cvsroot=toon&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/tag/tag/ransac.h?cvsroot=toon&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/tag/build/install.bat?cvsroot=toon&rev=1.1
Patches:
Index: build/vc2008/tag.sln
===================================================================
RCS file: /cvsroot/toon/tag/build/vc2008/tag.sln,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- build/vc2008/tag.sln 12 Jul 2009 12:28:31 -0000 1.2
+++ build/vc2008/tag.sln 5 Aug 2009 14:18:43 -0000 1.3
@@ -3,6 +3,11 @@
# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tag", "tag.vcproj",
"{1637B117-A476-4861-8998-83C6C3B42086}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install",
"install.vcproj", "{78ED5E94-8383-418F-876D-8FB7AFD2E7BF}"
+ ProjectSection(ProjectDependencies) = postProject
+ {1637B117-A476-4861-8998-83C6C3B42086} =
{1637B117-A476-4861-8998-83C6C3B42086}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -13,6 +18,10 @@
{1637B117-A476-4861-8998-83C6C3B42086}.Debug|Win32.Build.0 =
Debug|Win32
{1637B117-A476-4861-8998-83C6C3B42086}.Release|Win32.ActiveCfg
= Release|Win32
{1637B117-A476-4861-8998-83C6C3B42086}.Release|Win32.Build.0 =
Release|Win32
+ {78ED5E94-8383-418F-876D-8FB7AFD2E7BF}.Debug|Win32.ActiveCfg =
Debug|Win32
+ {78ED5E94-8383-418F-876D-8FB7AFD2E7BF}.Debug|Win32.Build.0 =
Debug|Win32
+ {78ED5E94-8383-418F-876D-8FB7AFD2E7BF}.Release|Win32.ActiveCfg
= Release|Win32
+ {78ED5E94-8383-418F-876D-8FB7AFD2E7BF}.Release|Win32.Build.0 =
Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Index: build/vc2008/tag.vcproj
===================================================================
RCS file: /cvsroot/toon/tag/build/vc2008/tag.vcproj,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- build/vc2008/tag.vcproj 12 Jul 2009 12:28:31 -0000 1.2
+++ build/vc2008/tag.vcproj 5 Aug 2009 14:18:43 -0000 1.3
@@ -41,7 +41,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories="..\..;..\..\.."
+
AdditionalIncludeDirectories="..\..;"$(INCLUDEDIR)""
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
@@ -61,7 +61,9 @@
/>
<Tool
Name="VCLibrarianTool"
+ AdditionalDependencies="clapackd.lib blasd.lib
libf2cd.lib"
OutputFile="..\..\lib\$(ProjectName)d.lib"
+
AdditionalLibraryDirectories=""$(LIBDIR)""
/>
<Tool
Name="VCALinkTool"
@@ -106,9 +108,10 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
FavorSizeOrSpeed="1"
- AdditionalIncludeDirectories="..\..;..\..\.."
+
AdditionalIncludeDirectories="..\..;"$(INCLUDEDIR)""
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
RuntimeLibrary="2"
+ EnableEnhancedInstructionSet="2"
UsePrecompiledHeader="0"
WarningLevel="3"
DebugInformationFormat="3"
@@ -124,7 +127,9 @@
/>
<Tool
Name="VCLibrarianTool"
+ AdditionalDependencies="clapack.lib blas.lib
libf2c.lib"
OutputFile="..\..\lib\$(ProjectName).lib"
+
AdditionalLibraryDirectories=""$(LIBDIR)""
/>
<Tool
Name="VCALinkTool"
@@ -266,16 +271,6 @@
>
</File>
</Filter>
- <Filter
- Name="Resource Files"
-
Filter="rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav"
-
UniqueIdentifier="{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}"
- >
- </Filter>
- <File
- RelativePath=".\ReadMe.txt"
- >
- </File>
</Files>
<Globals>
</Globals>
Index: tag/ransac.h
===================================================================
RCS file: /cvsroot/toon/tag/tag/ransac.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- tag/ransac.h 18 Feb 2008 17:30:01 -0000 1.10
+++ tag/ransac.h 5 Aug 2009 14:18:43 -0000 1.11
@@ -6,6 +6,19 @@
namespace tag {
+#ifdef WIN32
+/// taken from http://www.azillionmonkeys.com/qed/random.html
+inline double drand48(void) {
+ const double RS_SCALE = (1.0 / (1.0 + RAND_MAX));
+
+ double d;
+ do {
+ d = (((rand () * RS_SCALE) + rand ()) * RS_SCALE + rand ()) *
RS_SCALE;
+ } while (d >= 1); /* Round off */
+ return d;
+}
+#endif
+
/// @defgroup ransac RANSAC robust estimation
/// This group contains a set of RANSAC implementations to estimate an
/// inlier set from a set of correspondences under a transformation.
Index: build/install.bat
===================================================================
RCS file: build/install.bat
diff -N build/install.bat
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ build/install.bat 5 Aug 2009 14:18:43 -0000 1.1
@@ -0,0 +1,71 @@
+rem @echo off
+
+set headersdir=%1
+set headersname=%2
+set libs=%3
+set bins=%4
+
+rem ************************************************************************
+rem * check environment variables
+
+if not "%INCLUDEDIR%"=="" goto includedirset
+echo The INCLUDEDIR environment variable must be set to point to a directory
+echo to be able to perform the installation procedure.
+exit
+
+:includedirset
+if exist %INCLUDEDIR%\*.* goto includedirexists
+echo The INCLUDEDIR environment variable must point to an existing directory
+echo to be able to perform the installation procedure.
+exit
+
+:includedirexists
+
+if not "%LIBDIR%"=="" goto libdirset
+echo The LIBDIR environment variable must be set to point to a directory
+echo to be able to perform the installation procedure.
+exit
+
+:libdirset
+if exist %LIBDIR%\*.* goto libdirexists
+echo The LIBDIR environment variable must point to an existing directory
+echo to be able to perform the installation procedure.
+exit
+
+:libdirexists
+if not "%BINDIR%"=="" goto bindirset
+echo The BINDIR environment variable must be set to point to a directory
+echo to be able to perform the installation procedure.
+exit
+
+:bindirset
+if exist %BINDIR%\*.* goto bindirexists
+echo The BINDIR environment variable must point to an existing directory
+echo to be able to perform the installation procedure.
+exit
+
+:bindirexists
+
+echo All is well installing...
+
+rem ************************************************************************
+rem * check input variables and install if necessary
+
+if "%headersdir%"=="" goto skipheaders
+if "%headersname%"=="" goto skipheaders
+
+xcopy /S /I /Y %headersdir% %INCLUDEDIR%\%headersname%
+
+:skipheaders
+
+if "%libs%"=="" goto skiplibs
+xcopy /S /I /Y %libs% %LIBDIR%
+
+:skiplibs
+
+if "%bins%"=="" goto skipbins
+xcopy /S /I /Y %bins% %BINDIR%
+
+:skipbins
+
+echo Installation finished.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Toon-members] tag build/vc2008/tag.sln build/vc2008/tag.vcpro...,
Gerhard Reitmayr <=