This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch upstream-master
in repository pktools.
commit 3463b667991f08e41e50e5659b3a764d73a586c6
Author: unknown <kempe...@p1102740.vito.local>
Date: Tue Dec 2 15:17:26 2014 +0100
replaced array with vector in myfann_cpp.h for visual studio compiler
---
src/algorithms/myfann_cpp.h | 18 ++++++++++++------
vis_studio/algorithm/algorithm.vcxproj | 6 ++++++
vis_studio/algorithm/algorithm.vcxproj.filters | 6 ++++++
vis_studio/base/base.vcxproj | 3 +++
vis_studio/fileclasses/fileclasses.vcxproj | 2 ++
vis_studio/imageclasses/imageclasses.vcxproj | 2 ++
vis_studio/pkann/pkann.vcxproj | 2 ++
vis_studio/pkascii2img/pkascii2img.vcxproj | 6 ++++--
vis_studio/pkcomposit/pkcomposit.vcxproj | 2 ++
vis_studio/pkcreatect/pkcreatect.vcxproj | 2 ++
vis_studio/pkcrop/pkcrop.vcxproj | 2 ++
vis_studio/pkdiff/pkdiff.vcxproj | 2 ++
vis_studio/pkdsm2shadow/pkdsm2shadow.vcxproj | 2 ++
vis_studio/pkdumpimg/pkdumpimg.vcxproj | 6 ++++--
vis_studio/pkegcs/pkegcs.vcxproj | 2 ++
vis_studio/pkextract/pkextract.vcxproj | 2 ++
vis_studio/pkfillnodata/pkfillnodata.vcxproj | 6 ++++--
vis_studio/pkfilter/pkfilter.vcxproj | 2 ++
vis_studio/pkfilterascii/pkfilterascii.vcxproj | 2 ++
vis_studio/pkfilterdem/pkfilterdem.vcxproj | 2 ++
vis_studio/pkfsann/pkfsann.vcxproj | 2 ++
vis_studio/pkfssvm/pkfssvm.vcxproj | 2 ++
vis_studio/pkgetmask/pkgetmask.vcxproj | 6 ++++--
vis_studio/pkinfo/pkinfo.vcxproj | 2 ++
vis_studio/pkoptsvm/pkoptsvm.vcxproj | 2 ++
vis_studio/pkpolygonize/pkpolygonize.vcxproj | 6 ++++--
vis_studio/pkreclass/pkreclass.vcxproj | 6 ++++--
vis_studio/pkregann/pkregann.vcxproj | 2 ++
vis_studio/pksetmask/pksetmask.vcxproj | 6 ++++--
vis_studio/pksieve/pksieve.vcxproj | 2 ++
vis_studio/pkstatascii/pkstatascii.vcxproj | 2 ++
vis_studio/pkstatogr/pkstatogr.vcxproj | 2 ++
vis_studio/pksvm/pksvm.vcxproj | 2 ++
33 files changed, 99 insertions(+), 20 deletions(-)
diff --git a/src/algorithms/myfann_cpp.h b/src/algorithms/myfann_cpp.h
index 29e8997..6e1c370 100644
--- a/src/algorithms/myfann_cpp.h
+++ b/src/algorithms/myfann_cpp.h
@@ -1061,14 +1061,16 @@ public:
bool create_standard(unsigned int num_layers, ...)
{
va_list layers;
- unsigned int arr[num_layers];
+ std::vector<unsigned int> arr(num_layers);//pk
+ //unsigned int arr[num_layers];
va_start(layers, num_layers);
/* bool status = create_standard_array(num_layers, */
/* reinterpret_cast<const unsigned int *>(layers)); */
for (unsigned int ii = 0; ii < num_layers; ii++)
arr[ii] = va_arg(layers, unsigned int);
- bool status = create_standard_array(num_layers, arr);
+ bool status = create_standard_array(num_layers, &(arr[0]));//pk
+ //bool status = create_standard_array(num_layers, arr);
va_end(layers);
return status;
}
@@ -1116,7 +1118,8 @@ public:
bool create_sparse(float connection_rate, unsigned int num_layers, ...)
{
va_list layers;
- unsigned int arr[num_layers];
+ std::vector<unsigned int> arr(num_layers);//pk
+ //unsigned int arr[num_layers];
va_start(layers, num_layers);
/* bool status = create_sparse_array(connection_rate, num_layers,
*/
@@ -1124,7 +1127,8 @@ public:
for (unsigned int ii = 0; ii < num_layers; ii++)
arr[ii] = va_arg(layers, unsigned int);
- bool status = create_sparse_array(connection_rate, num_layers,
arr);
+ bool status = create_sparse_array(connection_rate, num_layers,
&(arr[0]));//pk
+ //bool status = create_sparse_array(connection_rate, num_layers,
arr);
va_end(layers);
return status;
@@ -1170,14 +1174,16 @@ public:
bool create_shortcut(unsigned int num_layers, ...)
{
va_list layers;
- unsigned int arr[num_layers];
+ std::vector<unsigned int> arr(num_layers);//pk
+ //unsigned int arr[num_layers];
va_start(layers, num_layers);
/* bool status = create_shortcut_array(num_layers, */
/* reinterpret_cast<const unsigned int *>(layers)); */
for (unsigned int ii = 0; ii < num_layers; ii++)
arr[ii] = va_arg(layers, unsigned int);
- bool status = create_shortcut_array(num_layers, arr);
+ bool status = create_shortcut_array(num_layers, &(arr[0]));//
+ //bool status = create_shortcut_array(num_layers, arr);
va_end(layers);
return status;
diff --git a/vis_studio/algorithm/algorithm.vcxproj
b/vis_studio/algorithm/algorithm.vcxproj
index dd1db3b..3f9d01d 100644
--- a/vis_studio/algorithm/algorithm.vcxproj
+++ b/vis_studio/algorithm/algorithm.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -46,6 +48,7 @@
</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
+
<AdditionalIncludeDirectories>D:\vis_studio\install\include\gsl;..\..\src</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -64,6 +67,7 @@
<Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
+ <AdditionalIncludeDirectories>..\..\src</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
@@ -82,6 +86,7 @@
<ItemGroup>
<ClInclude Include="..\..\src\algorithms\ConfusionMatrix.h" />
<ClInclude Include="..\..\src\algorithms\CostFactory.h" />
+ <ClInclude Include="..\..\src\algorithms\CostFactorySVM.h" />
<ClInclude Include="..\..\src\algorithms\Egcs.h" />
<ClInclude Include="..\..\src\algorithms\FeatureSelector.h" />
<ClInclude Include="..\..\src\algorithms\Filter.h" />
@@ -93,6 +98,7 @@
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\algorithms\ConfusionMatrix.cc" />
+ <ClCompile Include="..\..\src\algorithms\CostFactorySVM.cc" />
<ClCompile Include="..\..\src\algorithms\Egcs.cc" />
<ClCompile Include="..\..\src\algorithms\Filter.cc" />
<ClCompile Include="..\..\src\algorithms\Filter2d.cc" />
diff --git a/vis_studio/algorithm/algorithm.vcxproj.filters
b/vis_studio/algorithm/algorithm.vcxproj.filters
index f4810ce..d6af4c6 100644
--- a/vis_studio/algorithm/algorithm.vcxproj.filters
+++ b/vis_studio/algorithm/algorithm.vcxproj.filters
@@ -48,6 +48,9 @@
<ClInclude Include="..\..\src\algorithms\CostFactory.h">
<Filter>Header Files</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\algorithms\CostFactorySVM.h">
+ <Filter>Header Files</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\algorithms\ConfusionMatrix.cc">
@@ -65,5 +68,8 @@
<ClCompile Include="..\..\src\algorithms\svm.cpp">
<Filter>Source Files</Filter>
</ClCompile>
+ <ClCompile Include="..\..\src\algorithms\CostFactorySVM.cc">
+ <Filter>Source Files</Filter>
+ </ClCompile>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/vis_studio/base/base.vcxproj b/vis_studio/base/base.vcxproj
index 1c3a74d..dba14a5 100644
--- a/vis_studio/base/base.vcxproj
+++ b/vis_studio/base/base.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -61,6 +63,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>HAVE_CONFIG_H;_CRT_SECURE_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;WIN32;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>..\..\src</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
diff --git a/vis_studio/fileclasses/fileclasses.vcxproj
b/vis_studio/fileclasses/fileclasses.vcxproj
index a418f39..d733b66 100644
--- a/vis_studio/fileclasses/fileclasses.vcxproj
+++ b/vis_studio/fileclasses/fileclasses.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/vis_studio/imageclasses/imageclasses.vcxproj
b/vis_studio/imageclasses/imageclasses.vcxproj
index cd941f8..6df94ed 100644
--- a/vis_studio/imageclasses/imageclasses.vcxproj
+++ b/vis_studio/imageclasses/imageclasses.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/vis_studio/pkann/pkann.vcxproj b/vis_studio/pkann/pkann.vcxproj
index 36d277d..6e75c97 100644
--- a/vis_studio/pkann/pkann.vcxproj
+++ b/vis_studio/pkann/pkann.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/vis_studio/pkascii2img/pkascii2img.vcxproj
b/vis_studio/pkascii2img/pkascii2img.vcxproj
index 12d1d29..b2f3b4b 100644
--- a/vis_studio/pkascii2img/pkascii2img.vcxproj
+++ b/vis_studio/pkascii2img/pkascii2img.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -91,4 +93,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/vis_studio/pkcomposit/pkcomposit.vcxproj
b/vis_studio/pkcomposit/pkcomposit.vcxproj
index b8e6693..8ccbcc9 100644
--- a/vis_studio/pkcomposit/pkcomposit.vcxproj
+++ b/vis_studio/pkcomposit/pkcomposit.vcxproj
@@ -21,12 +21,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/vis_studio/pkcreatect/pkcreatect.vcxproj
b/vis_studio/pkcreatect/pkcreatect.vcxproj
index 59d2f86..81f2117 100644
--- a/vis_studio/pkcreatect/pkcreatect.vcxproj
+++ b/vis_studio/pkcreatect/pkcreatect.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/vis_studio/pkcrop/pkcrop.vcxproj b/vis_studio/pkcrop/pkcrop.vcxproj
index 975870e..e3a1482 100644
--- a/vis_studio/pkcrop/pkcrop.vcxproj
+++ b/vis_studio/pkcrop/pkcrop.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/vis_studio/pkdiff/pkdiff.vcxproj b/vis_studio/pkdiff/pkdiff.vcxproj
index 94da9ec..c3d66e6 100644
--- a/vis_studio/pkdiff/pkdiff.vcxproj
+++ b/vis_studio/pkdiff/pkdiff.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/vis_studio/pkdsm2shadow/pkdsm2shadow.vcxproj
b/vis_studio/pkdsm2shadow/pkdsm2shadow.vcxproj
index 67a5db8..e49f7d7 100644
--- a/vis_studio/pkdsm2shadow/pkdsm2shadow.vcxproj
+++ b/vis_studio/pkdsm2shadow/pkdsm2shadow.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/vis_studio/pkdumpimg/pkdumpimg.vcxproj
b/vis_studio/pkdumpimg/pkdumpimg.vcxproj
index 897fad5..365ae17 100644
--- a/vis_studio/pkdumpimg/pkdumpimg.vcxproj
+++ b/vis_studio/pkdumpimg/pkdumpimg.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -91,4 +93,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/vis_studio/pkegcs/pkegcs.vcxproj b/vis_studio/pkegcs/pkegcs.vcxproj
index 335295c..3c0a63c 100644
--- a/vis_studio/pkegcs/pkegcs.vcxproj
+++ b/vis_studio/pkegcs/pkegcs.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/vis_studio/pkextract/pkextract.vcxproj
b/vis_studio/pkextract/pkextract.vcxproj
index 70f489c..7d94237 100644
--- a/vis_studio/pkextract/pkextract.vcxproj
+++ b/vis_studio/pkextract/pkextract.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/vis_studio/pkfillnodata/pkfillnodata.vcxproj
b/vis_studio/pkfillnodata/pkfillnodata.vcxproj
index 79ca65e..569fd61 100644
--- a/vis_studio/pkfillnodata/pkfillnodata.vcxproj
+++ b/vis_studio/pkfillnodata/pkfillnodata.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -91,4 +93,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/vis_studio/pkfilter/pkfilter.vcxproj
b/vis_studio/pkfilter/pkfilter.vcxproj
index 53140f4..8859fca 100644
--- a/vis_studio/pkfilter/pkfilter.vcxproj
+++ b/vis_studio/pkfilter/pkfilter.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/vis_studio/pkfilterascii/pkfilterascii.vcxproj
b/vis_studio/pkfilterascii/pkfilterascii.vcxproj
index 2711324..de7aa78 100644
--- a/vis_studio/pkfilterascii/pkfilterascii.vcxproj
+++ b/vis_studio/pkfilterascii/pkfilterascii.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/vis_studio/pkfilterdem/pkfilterdem.vcxproj
b/vis_studio/pkfilterdem/pkfilterdem.vcxproj
index ea73efc..a76496f 100644
--- a/vis_studio/pkfilterdem/pkfilterdem.vcxproj
+++ b/vis_studio/pkfilterdem/pkfilterdem.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/vis_studio/pkfsann/pkfsann.vcxproj
b/vis_studio/pkfsann/pkfsann.vcxproj
index 94c2c4b..af66e9e 100644
--- a/vis_studio/pkfsann/pkfsann.vcxproj
+++ b/vis_studio/pkfsann/pkfsann.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/vis_studio/pkfssvm/pkfssvm.vcxproj
b/vis_studio/pkfssvm/pkfssvm.vcxproj
index ae0abae..81c046b 100644
--- a/vis_studio/pkfssvm/pkfssvm.vcxproj
+++ b/vis_studio/pkfssvm/pkfssvm.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/vis_studio/pkgetmask/pkgetmask.vcxproj
b/vis_studio/pkgetmask/pkgetmask.vcxproj
index 8c6ed03..c4a633e 100644
--- a/vis_studio/pkgetmask/pkgetmask.vcxproj
+++ b/vis_studio/pkgetmask/pkgetmask.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -91,4 +93,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/vis_studio/pkinfo/pkinfo.vcxproj b/vis_studio/pkinfo/pkinfo.vcxproj
index 98c267c..126ae92 100644
--- a/vis_studio/pkinfo/pkinfo.vcxproj
+++ b/vis_studio/pkinfo/pkinfo.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/vis_studio/pkoptsvm/pkoptsvm.vcxproj
b/vis_studio/pkoptsvm/pkoptsvm.vcxproj
index 8c64b1d..1bed9d5 100644
--- a/vis_studio/pkoptsvm/pkoptsvm.vcxproj
+++ b/vis_studio/pkoptsvm/pkoptsvm.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/vis_studio/pkpolygonize/pkpolygonize.vcxproj
b/vis_studio/pkpolygonize/pkpolygonize.vcxproj
index f1f4913..3012401 100644
--- a/vis_studio/pkpolygonize/pkpolygonize.vcxproj
+++ b/vis_studio/pkpolygonize/pkpolygonize.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -91,4 +93,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/vis_studio/pkreclass/pkreclass.vcxproj
b/vis_studio/pkreclass/pkreclass.vcxproj
index d8cc2cf..116997d 100644
--- a/vis_studio/pkreclass/pkreclass.vcxproj
+++ b/vis_studio/pkreclass/pkreclass.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -91,4 +93,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/vis_studio/pkregann/pkregann.vcxproj
b/vis_studio/pkregann/pkregann.vcxproj
index 93a98df..91b48ef 100644
--- a/vis_studio/pkregann/pkregann.vcxproj
+++ b/vis_studio/pkregann/pkregann.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/vis_studio/pksetmask/pksetmask.vcxproj
b/vis_studio/pksetmask/pksetmask.vcxproj
index 6b420ee..390957d 100644
--- a/vis_studio/pksetmask/pksetmask.vcxproj
+++ b/vis_studio/pksetmask/pksetmask.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -91,4 +93,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/vis_studio/pksieve/pksieve.vcxproj
b/vis_studio/pksieve/pksieve.vcxproj
index 1389110..3612c68 100644
--- a/vis_studio/pksieve/pksieve.vcxproj
+++ b/vis_studio/pksieve/pksieve.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/vis_studio/pkstatascii/pkstatascii.vcxproj
b/vis_studio/pkstatascii/pkstatascii.vcxproj
index c7470f3..88e4800 100644
--- a/vis_studio/pkstatascii/pkstatascii.vcxproj
+++ b/vis_studio/pkstatascii/pkstatascii.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/vis_studio/pkstatogr/pkstatogr.vcxproj
b/vis_studio/pkstatogr/pkstatogr.vcxproj
index b73d346..2879288 100644
--- a/vis_studio/pkstatogr/pkstatogr.vcxproj
+++ b/vis_studio/pkstatogr/pkstatogr.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
diff --git a/vis_studio/pksvm/pksvm.vcxproj b/vis_studio/pksvm/pksvm.vcxproj
index aa50e82..b74ab06 100644
--- a/vis_studio/pksvm/pksvm.vcxproj
+++ b/vis_studio/pksvm/pksvm.vcxproj
@@ -20,12 +20,14 @@
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"
Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>NotSet</CharacterSet>
+ <PlatformToolset>v110</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/pktools.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
