[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[libcvd-members] gvars3 build/vc2008/gvars3-headless.vcproj buil...
|
From: |
Gerhard Reitmayr |
|
Subject: |
[libcvd-members] gvars3 build/vc2008/gvars3-headless.vcproj buil... |
|
Date: |
Wed, 05 Aug 2009 15:02:16 +0000 |
CVSROOT: /cvsroot/libcvd
Module name: gvars3
Changes by: Gerhard Reitmayr <gerhard> 09/08/05 15:02:16
Modified files:
build/vc2008 : gvars3-headless.vcproj gvars3.sln gvars3.vcproj
gvars3 : default.h
Added files:
build : install.bat
Log message:
vc2008 project files with install now
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gvars3/build/vc2008/gvars3-headless.vcproj?cvsroot=libcvd&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gvars3/build/vc2008/gvars3.sln?cvsroot=libcvd&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gvars3/build/vc2008/gvars3.vcproj?cvsroot=libcvd&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gvars3/gvars3/default.h?cvsroot=libcvd&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gvars3/build/install.bat?cvsroot=libcvd&rev=1.1
Patches:
Index: build/vc2008/gvars3-headless.vcproj
===================================================================
RCS file: /cvsroot/libcvd/gvars3/build/vc2008/gvars3-headless.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- build/vc2008/gvars3-headless.vcproj 1 Apr 2009 17:07:00 -0000 1.1
+++ build/vc2008/gvars3-headless.vcproj 5 Aug 2009 15:02:16 -0000 1.2
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="gvars3-headless"
ProjectGUID="{30D8E485-EE60-4E92-ABEA-50C628FBCE59}"
RootNamespace="gvars3"
Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -40,14 +41,13 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\Pre-built.2\include"
+
AdditionalIncludeDirectories="..\..;"$(INCLUDEDIR)""
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@@ -106,12 +106,12 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
FavorSizeOrSpeed="1"
-
AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\Pre-built.2\include"
+
AdditionalIncludeDirectories="..\..;"$(INCLUDEDIR)""
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
- RuntimeLibrary="0"
+ RuntimeLibrary="2"
+ EnableEnhancedInstructionSet="2"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@@ -191,6 +191,32 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
+ RelativePath=".\config.h"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="copy $(InputPath)
..\..\gvars3
"
+
Outputs="..\..\gvars3\$(InputFileName)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="copy $(InputPath)
..\..\gvars3
"
+
Outputs="..\..\gvars3\$(InputFileName)"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\..\gvars3\default.h"
+ >
+ </File>
+ <File
RelativePath="..\..\gvars3\GStringUtil.h"
>
</File>
Index: build/vc2008/gvars3.sln
===================================================================
RCS file: /cvsroot/libcvd/gvars3/build/vc2008/gvars3.sln,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- build/vc2008/gvars3.sln 1 Apr 2009 17:07:03 -0000 1.1
+++ build/vc2008/gvars3.sln 5 Aug 2009 15:02:16 -0000 1.2
@@ -1,10 +1,15 @@

-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvars3", "gvars3.vcproj",
"{81160AD9-2883-4EDD-AF09-35E3F4C9BA1E}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gvars3-headless",
"gvars3-headless.vcproj", "{30D8E485-EE60-4E92-ABEA-50C628FBCE59}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "install",
"install.vcproj", "{78ED5E94-8383-418F-876D-8FB7AFD2E7BF}"
+ ProjectSection(ProjectDependencies) = postProject
+ {30D8E485-EE60-4E92-ABEA-50C628FBCE59} =
{30D8E485-EE60-4E92-ABEA-50C628FBCE59}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -19,6 +24,10 @@
{30D8E485-EE60-4E92-ABEA-50C628FBCE59}.Debug|Win32.Build.0 =
Debug|Win32
{30D8E485-EE60-4E92-ABEA-50C628FBCE59}.Release|Win32.ActiveCfg
= Release|Win32
{30D8E485-EE60-4E92-ABEA-50C628FBCE59}.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/gvars3.vcproj
===================================================================
RCS file: /cvsroot/libcvd/gvars3/build/vc2008/gvars3.vcproj,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- build/vc2008/gvars3.vcproj 1 Apr 2009 17:07:03 -0000 1.1
+++ build/vc2008/gvars3.vcproj 5 Aug 2009 15:02:16 -0000 1.2
@@ -1,11 +1,12 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="8.00"
+ Version="9.00"
Name="gvars3"
ProjectGUID="{81160AD9-2883-4EDD-AF09-35E3F4C9BA1E}"
RootNamespace="gvars3"
Keyword="Win32Proj"
+ TargetFrameworkVersion="131072"
>
<Platforms>
<Platform
@@ -40,14 +41,13 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
-
AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\Pre-built.2\include;..\..\..\fltk-2.0"
+
AdditionalIncludeDirectories="..\..;"$(INCLUDEDIR)""
PreprocessorDefinitions="WIN32;_DEBUG;_LIB"
MinimalRebuild="true"
BasicRuntimeChecks="3"
- RuntimeLibrary="1"
+ RuntimeLibrary="3"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="4"
/>
<Tool
@@ -106,12 +106,11 @@
Name="VCCLCompilerTool"
InlineFunctionExpansion="2"
FavorSizeOrSpeed="1"
-
AdditionalIncludeDirectories="..\..;..\..\..;..\..\..\Pre-built.2\include;..\..\..\fltk-2.0"
+
AdditionalIncludeDirectories="..\..;"$(INCLUDEDIR)""
PreprocessorDefinitions="WIN32;NDEBUG;_LIB"
- RuntimeLibrary="0"
+ RuntimeLibrary="2"
UsePrecompiledHeader="0"
WarningLevel="3"
- Detect64BitPortabilityProblems="true"
DebugInformationFormat="3"
/>
<Tool
@@ -195,6 +194,32 @@
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
>
<File
+ RelativePath=".\config.h"
+ >
+ <FileConfiguration
+ Name="Debug|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="copy $(InputPath)
..\..\gvars3
"
+
Outputs="..\..\gvars3\$(InputFileName)"
+ />
+ </FileConfiguration>
+ <FileConfiguration
+ Name="Release|Win32"
+ >
+ <Tool
+ Name="VCCustomBuildTool"
+ CommandLine="copy $(InputPath)
..\..\gvars3
"
+
Outputs="..\..\gvars3\$(InputFileName)"
+ />
+ </FileConfiguration>
+ </File>
+ <File
+ RelativePath="..\..\gvars3\default.h"
+ >
+ </File>
+ <File
RelativePath="..\..\gvars3\GStringUtil.h"
>
</File>
Index: gvars3/default.h
===================================================================
RCS file: /cvsroot/libcvd/gvars3/gvars3/default.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- gvars3/default.h 22 Apr 2009 09:55:46 -0000 1.2
+++ gvars3/default.h 5 Aug 2009 15:02:16 -0000 1.3
@@ -38,6 +38,10 @@
}
};
+template <class C> inline const C defaultValue() {
+ return C();
+}
+
template<class C> struct IsAwkward
{
static const int is=0;
@@ -47,12 +51,16 @@
#ifdef GVARS3_HAVE_TOON
template<> struct DefaultValue<TooN::Vector<-1> >
{
- inline static const TooN::Vector<-1> val()
+ static inline const TooN::Vector<-1> val()
{
return TooN::makeVector(0);
}
};
+template <> inline const TooN::Vector<-1> defaultValue() {
+ return TooN::makeVector(0);
+}
+
template<> struct IsAwkward<TooN::Vector<-1> >
{
static const int is=1;
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 15:02:16 -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] |
- [libcvd-members] gvars3 build/vc2008/gvars3-headless.vcproj buil...,
Gerhard Reitmayr <=