[mapguide-commits] r8760 - in trunk/MgDev: . Common/Foundation Common/Geometry Common/MapGuideCommon Common/MdfModel Common/MdfParser Common/PlatformBase Common/Renderers Common/Security Common/Stylization Oem Oem/ACE/ACE_wrappers/ace Oem/ACE/ACE_wrappers/ace/os_include Oem/CppUnit-1.9.14/src/cppunit Oem/DWFTK/develop/global/build Oem/DWFTK/develop/global/src/dwf/XAML Oem/DWFTK/develop/global/src/dwf/dwfx Oem/DWFTK/develop/global/src/dwf/package Oem/DWFTK/develop/global/src/dwf/package/reader Oem/DWFTK/develop/global/src/dwf/package/writer Oem/DWFTK/develop/global/src/dwf/presentation Oem/DWFTK/develop/global/src/dwf/presentation/reader Oem/DWFTK/develop/global/src/dwf/publisher/impl Oem/DWFTK/develop/global/src/dwf/w3dtk Oem/DWFTK/develop/global/src/dwf/whiptk Oem/DWFTK/develop/global/src/dwfcore/win32 Oem/LinuxApt Oem/SQLite/src/SQLite3 Oem/SQLite/src/SQLitePhpApi Oem/SQLite/src/SQLiteUnitTest Oem/SQLite/src/SqliteDotNet Oem/SQLite/src/SqliteVM Oem/dbxml/db-4.8.26/build_windows Oem/dbxml/dbx ml/build_windows Oem/dbxml/dbxml/src/dbxml/nodeStore Oem/dbxml/xerces-c-src/projects/Win32/VS/xerces-all/XercesLib Oem/dbxml/xqilla/Win32Projects/VS Oem/dbxml/xqilla/include/xqilla/framework Oem/gd/build/win32/gd Oem/gd/freetype/builds/win32/visualc Oem/gd/freetype/include/freetype Oem/gd/freetype/src/base Oem/gd/jpeg Oem/gd/lpng/projects/vs Oem/geos/VisualStudio Oem/geos/src/algorithm Oem/geos/src/geom Oem/geos/src/io Oem/geos/src/operation/buffer Oem/jsoncpp/src/lib_json Server Server/src/Common/Base Server/src/Common/Cache Server/src/Common/Manager Server/src/Common/Thread Server/src/Core Server/src/Gws/GwsCommon Server/src/Gws/GwsQueryEngine Server/src/Gws/GwsResource Server/src/Gws/Include Server/src/PostBuild Server/src/Services/Drawing Server/src/Services/Feature Server/src/Services/Kml Server/src/Services/Mapping Server/src/Services/Profiling Server/src/Services/Rendering Server/src/Services/Resource Server/src/Services/ServerAdmin Server/src/Services/Site Server/src/Service s/Tile Server/src/UnitTesting Web/src Web/src/ApacheAgent Web/src/CgiAgent Web/src/DotNetApi/Foundation Web/src/DotNetApi/Geometry Web/src/DotNetApi/MapGuideCommon Web/src/DotNetApi/PlatformBase Web/src/DotNetApi/Web Web/src/DotNetUnmanagedApi/Foundation Web/src/DotNetUnmanagedApi/Geometry Web/src/DotNetUnmanagedApi/MapGuideCommon Web/src/DotNetUnmanagedApi/PlatformBase Web/src/DotNetUnmanagedApi/Web Web/src/HttpHandler Web/src/IsapiAgent Web/src/JavaApi Web/src/JavaApiEx Web/src/MapAgentCommon Web/src/MapGuideApi Web/src/PhpApi Web/src/PhpMapGuideApiEnvConfig Web/src/PostBuild Web/src/WebApp Web/src/WebSupport
svn_mapguide at osgeo.org
svn_mapguide at osgeo.org
Sun Sep 20 21:22:58 PDT 2015
Author: christinebao
Date: 2015-09-20 21:22:58 -0700 (Sun, 20 Sep 2015)
New Revision: 8760
Added:
trunk/MgDev/Oem/DWFTK/develop/global/build/VC 14.0/
Modified:
trunk/MgDev/
trunk/MgDev/Common/Foundation/Foundation.vcxproj
trunk/MgDev/Common/Geometry/Geometry.vcxproj
trunk/MgDev/Common/MapGuideCommon/MapGuideCommon.vcxproj
trunk/MgDev/Common/MdfModel/MdfModel.vcxproj
trunk/MgDev/Common/MdfParser/MdfParser.vcxproj
trunk/MgDev/Common/PlatformBase/PlatformBase.vcxproj
trunk/MgDev/Common/Renderers/Renderers.vcxproj
trunk/MgDev/Common/Security/Security.vcxproj
trunk/MgDev/Common/Stylization/Stylization.vcxproj
trunk/MgDev/Oem/ACE/ACE_wrappers/ace/ACE.vcxproj
trunk/MgDev/Oem/ACE/ACE_wrappers/ace/os_include/os_time.h
trunk/MgDev/Oem/CppUnit-1.9.14/src/cppunit/cppunit.vcxproj
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/XAML/XamlArcSegment.h
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/XAML/XamlBrushes.h
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/XAML/XamlDrawableAttributes.h
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/dwfx/FixedPage.cpp
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/Content.cpp
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/ContentManager.cpp
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/DefinedObject.cpp
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/Feature.h
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/GraphicResource.cpp
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/PropertySet.cpp
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/Section.cpp
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/SectionContentResource.cpp
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/reader/PackageReader.cpp
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/writer/DWF6PackageWriter.cpp
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/writer/DWFXPackageWriter.cpp
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/writer/PackageWriter.cpp
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/presentation/ContentPresentationResource.cpp
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/presentation/reader/ContentPresentationReader.cpp
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/publisher/impl/PublishedContentElement.cpp
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/w3dtk/BAscii.cpp
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/w3dtk/BOpcodeHandler.cpp
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/w3dtk/BPolyhedronAscii.cpp
trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/whiptk/typedefs_defines.h
trunk/MgDev/Oem/DWFTK/develop/global/src/dwfcore/win32/Core.cpp
trunk/MgDev/Oem/LinuxApt/php-5.5.17.tar.bz2
trunk/MgDev/Oem/SQLite/src/SQLite3/SQLite.vcxproj
trunk/MgDev/Oem/SQLite/src/SQLitePhpApi/SQLitePhpApi.vcxproj
trunk/MgDev/Oem/SQLite/src/SQLiteUnitTest/SQLiteUnitTest.vcxproj
trunk/MgDev/Oem/SQLite/src/SqliteDotNet/SqliteDotNet.cpp
trunk/MgDev/Oem/SQLite/src/SqliteDotNet/SqliteDotNet.h
trunk/MgDev/Oem/SQLite/src/SqliteDotNet/SqliteDotNet.vcxproj
trunk/MgDev/Oem/SQLite/src/SqliteVM/sqliteVM.vcxproj
trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_archive.vcxproj
trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_checkpoint.vcxproj
trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_dll.vcxproj
trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_dump.vcxproj
trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_hotbackup.vcxproj
trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_load.vcxproj
trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_recover.vcxproj
trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_upgrade.vcxproj
trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_verify.vcxproj
trunk/MgDev/Oem/dbxml/dbxml/build_windows/dbxml.vcxproj
trunk/MgDev/Oem/dbxml/dbxml/build_windows/dbxml_dump.vcxproj
trunk/MgDev/Oem/dbxml/dbxml/build_windows/dbxml_load.vcxproj
trunk/MgDev/Oem/dbxml/dbxml/build_windows/dbxml_shell.vcxproj
trunk/MgDev/Oem/dbxml/dbxml/src/dbxml/nodeStore/NsXercesTranscoder.cpp
trunk/MgDev/Oem/dbxml/xerces-c-src/projects/Win32/VS/xerces-all/XercesLib/XercesLib.vcxproj
trunk/MgDev/Oem/dbxml/xqilla/Win32Projects/VS/xqilla.vcxproj
trunk/MgDev/Oem/dbxml/xqilla/include/xqilla/framework/XPath2MemoryManager.hpp
trunk/MgDev/Oem/gd/build/win32/gd/gd.vcxproj
trunk/MgDev/Oem/gd/freetype/builds/win32/visualc/freetype.vcxproj
trunk/MgDev/Oem/gd/freetype/include/freetype/freetype.h
trunk/MgDev/Oem/gd/freetype/src/base/ftobjs.c
trunk/MgDev/Oem/gd/jpeg/jpeg.vcxproj
trunk/MgDev/Oem/gd/lpng/projects/vs/libpng.vcxproj
trunk/MgDev/Oem/gd/lpng/projects/vs/zlib.vcxproj
trunk/MgDev/Oem/geos/VisualStudio/GEOS.vcxproj
trunk/MgDev/Oem/geos/src/algorithm/LineIntersector.cpp
trunk/MgDev/Oem/geos/src/geom/LineSegment.cpp
trunk/MgDev/Oem/geos/src/io/WKTWriter.cpp
trunk/MgDev/Oem/geos/src/operation/buffer/OffsetCurveSetBuilder.cpp
trunk/MgDev/Oem/jsoncpp/src/lib_json/lib_json.vcxproj
trunk/MgDev/Oem/oem.sln
trunk/MgDev/Server/Server.sln
trunk/MgDev/Server/src/Common/Base/ServerBase.vcxproj
trunk/MgDev/Server/src/Common/Cache/ServerCache.vcxproj
trunk/MgDev/Server/src/Common/Manager/ServerManager.vcxproj
trunk/MgDev/Server/src/Common/Thread/ServerThread.vcxproj
trunk/MgDev/Server/src/Core/ServerCore.vcxproj
trunk/MgDev/Server/src/Gws/GwsCommon/GwsCommon.vcxproj
trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsBatchSortedBlockJoinQueryResults.cpp
trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsFdoCommand.cpp
trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsFeatureQueryDefinition.cpp
trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsJoinQueryDefinition.cpp
trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsMutableFeature.cpp
trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryEngine.vcxproj
trunk/MgDev/Server/src/Gws/GwsResource/GwsResource.vcxproj
trunk/MgDev/Server/src/Gws/Include/GwsInclude.vcxproj
trunk/MgDev/Server/src/PostBuild/PostBuild.vcxproj
trunk/MgDev/Server/src/Services/Drawing/ServerDrawingService.vcxproj
trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.vcxproj
trunk/MgDev/Server/src/Services/Kml/ServerKmlService.vcxproj
trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.vcxproj
trunk/MgDev/Server/src/Services/Profiling/ServerProfilingService.vcxproj
trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.vcxproj
trunk/MgDev/Server/src/Services/Resource/ServerResourceService.vcxproj
trunk/MgDev/Server/src/Services/ServerAdmin/ServerAdminService.vcxproj
trunk/MgDev/Server/src/Services/Site/ServerSiteService.vcxproj
trunk/MgDev/Server/src/Services/Tile/ServerTileService.vcxproj
trunk/MgDev/Server/src/UnitTesting/UnitTesting.vcxproj
trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.vcxproj
trunk/MgDev/Web/src/CgiAgent/CgiAgent.vcxproj
trunk/MgDev/Web/src/DotNetApi/Foundation/FoundationDotNetApi.vcxproj
trunk/MgDev/Web/src/DotNetApi/Geometry/GeometryDotNetApi.vcxproj
trunk/MgDev/Web/src/DotNetApi/MapGuideCommon/MapGuideCommonDotNetApi.vcxproj
trunk/MgDev/Web/src/DotNetApi/PlatformBase/PlatformBaseDotNetApi.vcxproj
trunk/MgDev/Web/src/DotNetApi/Web/WebDotNetApi.vcxproj
trunk/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcxproj
trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcxproj
trunk/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcxproj
trunk/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcxproj
trunk/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApi.vcxproj
trunk/MgDev/Web/src/HttpHandler/HttpHandler.vcxproj
trunk/MgDev/Web/src/IsapiAgent/IsapiAgent.vcxproj
trunk/MgDev/Web/src/JavaApi/JavaApi.vcxproj
trunk/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj
trunk/MgDev/Web/src/MapAgentCommon/MapAgentCommon.vcxproj
trunk/MgDev/Web/src/MapGuideApi/MapGuideApi.vcxproj
trunk/MgDev/Web/src/PhpApi/PhpApi.vcxproj
trunk/MgDev/Web/src/PhpMapGuideApiEnvConfig/PhpMapGuideApiEnvConfig.vcxproj
trunk/MgDev/Web/src/PostBuild/PostBuild.vcxproj
trunk/MgDev/Web/src/WebApp/WebApp.vcxproj
trunk/MgDev/Web/src/WebSupport/WebSupport.vcxproj
trunk/MgDev/Web/src/WebTier.sln
Log:
Merge V140 to main branch.
Property changes on: trunk/MgDev
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
/branches/3.0/MgDev:8705,8710
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
/sandbox/jng/convenience_apis:8262-8268,8271-8363
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/dwftk:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
+ /branches/2.4/MgDev:6749-6756,6777-6783,6785-6787,6789,6791-6794,6796-6801,6954-6962,6986-7006
/branches/2.6/MgDev:8276-8286,8288-8292,8297,8299,8301,8303,8314-8315,8318,8335,8340,8354-8355,8365,8373
/branches/3.0/MgDev:8705,8710
/sandbox/VC140:8684-8759
/sandbox/adsk/2.6l:8727
/sandbox/adsk/3.0m:8563,8584,8607,8625,8694-8695
/sandbox/jng/convenience_apis:8262-8268,8271-8363
/sandbox/jng/createruntimemap:7486-7555
/sandbox/jng/dwftk:8321-8324,8328-8329,8331,8352
/sandbox/jng/geos34x:8256-8259
/sandbox/jng/tiling:8174-8208
/sandbox/jng/v30:8212-8227
/sandbox/rfc94:5099-5163
Modified: trunk/MgDev/Common/Foundation/Foundation.vcxproj
===================================================================
--- trunk/MgDev/Common/Foundation/Foundation.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Common/Foundation/Foundation.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Common/Geometry/Geometry.vcxproj
===================================================================
--- trunk/MgDev/Common/Geometry/Geometry.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Common/Geometry/Geometry.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -105,7 +105,7 @@
<Link>
<AdditionalDependencies>csmapd.lib;ACEd.lib;GEOSd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGeometryd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib110\$(Configuration);..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib140\$(Configuration);..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
@@ -131,7 +131,7 @@
<Link>
<AdditionalDependencies>csmapd.lib;ACEd.lib;GEOSd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGeometryd.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib110\$(Configuration)64;..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib140\$(Configuration)64;..\..\Oem\ACE\ACE_wrappers\lib64\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<ImportLibrary>..\lib\$(Configuration)64\MgGeometryd.lib</ImportLibrary>
@@ -153,7 +153,7 @@
<Link>
<AdditionalDependencies>csmap.lib;ACE.lib;GEOS.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGeometry.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib110\$(Configuration);..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib140\$(Configuration);..\..\Oem\ACE\ACE_wrappers\lib\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
@@ -180,7 +180,7 @@
<Link>
<AdditionalDependencies>csmap.lib;ACE.lib;GEOS.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)MgGeometry.dll</OutputFile>
- <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib110\$(Configuration)64;..\..\Oem\ACE\ACE_Wrappers\lib64\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>..\..\Oem\CsMap\lib140\$(Configuration)64;..\..\Oem\ACE\ACE_Wrappers\lib64\$(Configuration);..\..\Oem\geos\VisualStudio\$(Configuration)64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>
<OptimizeReferences>true</OptimizeReferences>
Modified: trunk/MgDev/Common/MapGuideCommon/MapGuideCommon.vcxproj
===================================================================
--- trunk/MgDev/Common/MapGuideCommon/MapGuideCommon.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Common/MapGuideCommon/MapGuideCommon.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Common/MdfModel/MdfModel.vcxproj
===================================================================
--- trunk/MgDev/Common/MdfModel/MdfModel.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Common/MdfModel/MdfModel.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Common/MdfParser/MdfParser.vcxproj
===================================================================
--- trunk/MgDev/Common/MdfParser/MdfParser.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Common/MdfParser/MdfParser.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Common/PlatformBase/PlatformBase.vcxproj
===================================================================
--- trunk/MgDev/Common/PlatformBase/PlatformBase.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Common/PlatformBase/PlatformBase.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Common/Renderers/Renderers.vcxproj
===================================================================
--- trunk/MgDev/Common/Renderers/Renderers.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Common/Renderers/Renderers.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Common/Security/Security.vcxproj
===================================================================
--- trunk/MgDev/Common/Security/Security.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Common/Security/Security.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Common/Stylization/Stylization.vcxproj
===================================================================
--- trunk/MgDev/Common/Stylization/Stylization.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Common/Stylization/Stylization.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/ACE/ACE_wrappers/ace/ACE.vcxproj
===================================================================
--- trunk/MgDev/Oem/ACE/ACE_wrappers/ace/ACE.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/ACE/ACE_wrappers/ace/ACE.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -29,26 +29,26 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<CharacterSet>NotSet</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
Modified: trunk/MgDev/Oem/ACE/ACE_wrappers/ace/os_include/os_time.h
===================================================================
--- trunk/MgDev/Oem/ACE/ACE_wrappers/ace/os_include/os_time.h 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/ACE/ACE_wrappers/ace/os_include/os_time.h 2015-09-21 04:22:58 UTC (rev 8760)
@@ -55,6 +55,7 @@
# if !defined (ACE_HAS_POSIX_TIME)
// Definition per POSIX.
+#if !(defined(_MSC_VER) && (_MSC_VER >= 1900)) //timespec is defined in VC140, not redefine in ACE.
typedef struct timespec
{
/// Seconds
@@ -62,6 +63,9 @@
/// Nanoseconds
long tv_nsec;
} timespec_t;
+#else
+typedef timespec timespec_t;
+#endif
# elif defined (ACE_HAS_BROKEN_POSIX_TIME)
# if defined (ACE_OPENVMS)
# include /**/ <timers.h>
Modified: trunk/MgDev/Oem/CppUnit-1.9.14/src/cppunit/cppunit.vcxproj
===================================================================
--- trunk/MgDev/Oem/CppUnit-1.9.14/src/cppunit/cppunit.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/CppUnit-1.9.14/src/cppunit/cppunit.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,25 +27,25 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/XAML/XamlArcSegment.h
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/XAML/XamlArcSegment.h 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/XAML/XamlArcSegment.h 2015-09-21 04:22:58 UTC (rev 8760)
@@ -29,7 +29,7 @@
class XamlArcSegment : public XamlGraphicsObject
{
public:
- typedef enum teSweepDirection
+ enum teSweepDirection
{
Clockwise,
Counterclockwise
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/XAML/XamlBrushes.h
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/XAML/XamlBrushes.h 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/XAML/XamlBrushes.h 2015-09-21 04:22:58 UTC (rev 8760)
@@ -29,7 +29,7 @@
namespace XamlBrush
{
- typedef enum eType
+ enum eType
{
kSolidColor,
kImage,
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/XAML/XamlDrawableAttributes.h
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/XAML/XamlDrawableAttributes.h 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/XAML/XamlDrawableAttributes.h 2015-09-21 04:22:58 UTC (rev 8760)
@@ -458,7 +458,7 @@
virtual bool validAsAttribute( void ) const;
public:
- typedef enum eCapStyle
+ enum eCapStyle
{
Flat,
Square,
@@ -535,7 +535,7 @@
virtual bool validAsAttribute( void ) const;
public:
- typedef enum eCapStyle
+ enum eCapStyle
{
Flat,
Square,
@@ -578,7 +578,7 @@
virtual bool validAsAttribute( void ) const;
public:
- typedef enum eCapStyle
+ enum eCapStyle
{
Flat,
Square,
@@ -621,7 +621,7 @@
virtual bool validAsAttribute( void ) const;
public:
- typedef enum eJoinStyle
+ enum eJoinStyle
{
None,
Miter,
@@ -1143,7 +1143,7 @@
virtual bool validAsAttribute( void ) const;
public:
- typedef enum eSimulationStyle
+ enum eSimulationStyle
{
None,
Italic,
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/dwfx/FixedPage.cpp
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/dwfx/FixedPage.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/dwfx/FixedPage.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -327,7 +327,7 @@
bool bFound = false;
int nZOrder = pResource->zOrder();
- DWFString zRole( pResource->role() );
+ DWFString zRole1( pResource->role() );
_tZOrderMap::iterator itOrder = _oZOrderMap.find( nZOrder );
if (itOrder != _oZOrderMap.end())
@@ -335,7 +335,7 @@
_tRoleMapPair* pMapPair = itOrder->second;
if (pMapPair)
{
- _tRolePartListMap::iterator itList = (pMapPair->_oParts).find( zRole );
+ _tRolePartListMap::iterator itList = (pMapPair->_oParts).find( zRole1 );
if (itList != (pMapPair->_oParts).end())
{
DWFXResourcePart::tList* pList = itList->second;
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/Content.cpp
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/Content.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/Content.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -621,11 +621,11 @@
DWFIterator<DWFString>* DWFContent::findResourceIDsByRenderable( DWFRenderable* pRenderable )
throw()
{
- typedef DWFCachingIterator<DWFString> _tStringIterator;
+ typedef DWFCachingIterator<DWFString> _tStringIterator1;
if (_oResourceRenderableToInstance.size() > 0)
{
- _tStringIterator* piResourceID = DWFCORE_ALLOC_OBJECT( _tStringIterator );
+ _tStringIterator1* piResourceID = DWFCORE_ALLOC_OBJECT( _tStringIterator1 );
_tResourceRIMapConstIterator iResource = _oResourceRenderableToInstance.begin();
for (; iResource != _oResourceRenderableToInstance.end(); ++iResource)
@@ -2847,24 +2847,24 @@
DWFContent::_mergeRefsEntities( DWFContent* pContent )
throw( DWFException )
{
- DWFEntity::tMap::Iterator* piEntity = pContent->_oEntities.iterator();
- if (piEntity)
+ DWFEntity::tMap::Iterator* piEntity1 = pContent->_oEntities.iterator();
+ if (piEntity1)
{
- for (; piEntity->valid(); piEntity->next())
+ for (; piEntity1->valid(); piEntity1->next())
{
- DWFEntity* pEntity = piEntity->value();
- DWFEntity* pLocalEntity =getEntity( pEntity->id() );
+ DWFEntity* pEntity1 = piEntity1->value();
+ DWFEntity* pLocalEntity =getEntity( pEntity1->id() );
if (pLocalEntity)
{
//
// Copy over property set references.
//
- _acquirePropertySetReferences( pEntity, pLocalEntity );
+ _acquirePropertySetReferences( pEntity1, pLocalEntity );
//
// Copy over child entity references.
//
- DWFEntity::tSortedList::ConstIterator* piEntity = pEntity->getChildren();
+ DWFEntity::tSortedList::ConstIterator* piEntity = pEntity1->getChildren();
if (piEntity)
{
for (; piEntity->valid(); piEntity->next())
@@ -2883,7 +2883,7 @@
//
// Copy over class references.
//
- DWFClass::tIterator* piClass = pEntity->getClasses();
+ DWFClass::tIterator* piClass = pEntity1->getClasses();
if (piClass)
{
for (; piClass->valid(); piClass->next())
@@ -2902,7 +2902,7 @@
//
// Copy over feature references.
//
- DWFFeature::tIterator* piFeature = pEntity->getFeatures();
+ DWFFeature::tIterator* piFeature = pEntity1->getFeatures();
if (piFeature)
{
for (; piFeature->valid(); piFeature->next())
@@ -2927,7 +2927,7 @@
}
}
- DWFCORE_FREE_OBJECT( piEntity );
+ DWFCORE_FREE_OBJECT( piEntity1 );
}
}
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/ContentManager.cpp
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/ContentManager.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/ContentManager.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -254,10 +254,10 @@
DWFContent* pContent = NULL;
- DWFContent** ppContent = _oContent.find( zContentID );
- if (ppContent)
+ DWFContent** ppContent1 = _oContent.find( zContentID );
+ if (ppContent1)
{
- pContent = *ppContent;
+ pContent = *ppContent1;
if (pContent->owner() == this)
{
pContent->disown( *this, true );
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/DefinedObject.cpp
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/DefinedObject.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/DefinedObject.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -490,7 +490,7 @@
//
// convert the instance pointer address as a string, and set to the instance id.
//
- long nId = (long)(this);
+ LONG_PTR nId = (LONG_PTR)(this);
int nBufferSize = 32;
DWFPointer<wchar_t> zBuffer( DWFCORE_ALLOC_MEMORY(wchar_t, nBufferSize), true );
int nBytes = sizeof(wchar_t) * _DWFCORE_SWPRINTF( zBuffer, nBufferSize, L"%d", nId );
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/Feature.h
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/Feature.h 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/Feature.h 2015-09-21 04:22:58 UTC (rev 8760)
@@ -89,7 +89,7 @@
/// This enum defines the attributes that this class will not resolve when
/// parsing attributes for the reader.
///
- typedef enum teUnresolvedAttributes
+ enum teUnresolvedAttributes
{
//
ePropertySetReferences = DWFPropertySet::ePropertySetReferences,
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/GraphicResource.cpp
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/GraphicResource.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/GraphicResource.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -358,14 +358,14 @@
throw( DWFException )
{
//DNT_Start
- DWFString zNamespace;
+ DWFString zNamespace1;
//
// namespace dictated by document and section type
//
if (nFlags & DWFPackageWriter::eDescriptor)
{
- zNamespace.assign( namespaceXML(nFlags) );
+ zNamespace1.assign( namespaceXML(nFlags) );
}
//
@@ -378,7 +378,7 @@
//
if ((nFlags & DWFXMLSerializer::eElementOpen) == 0)
{
- rSerializer.startElement( DWFXML::kzElement_GraphicResource, zNamespace );
+ rSerializer.startElement( DWFXML::kzElement_GraphicResource, zNamespace1 );
//
// let base class know not to start the element
@@ -515,14 +515,14 @@
DWFResourceRelationship::tList::Iterator *pIter = _oRelationships.iterator();
if (pIter)
{
- rSerializer.startElement( DWFXML::kzElement_Relationships, zNamespace );
+ rSerializer.startElement( DWFXML::kzElement_Relationships, zNamespace1 );
for (; pIter->valid(); pIter->next())
{
DWFResourceRelationship *pRelationship = pIter->get();
if(pRelationship != NULL)
{
- rSerializer.startElement( DWFXML::kzElement_Relationship, zNamespace );
+ rSerializer.startElement( DWFXML::kzElement_Relationship, zNamespace1 );
rSerializer.addAttribute( DWFXML::kzAttribute_ObjectID, pRelationship->resourceID() );
rSerializer.addAttribute( DWFXML::kzAttribute_Type, pRelationship->type());
rSerializer.endElement();
@@ -745,10 +745,10 @@
//
if (nFlags & DWFPackageWriter::eDescriptor)
{
- DWFString zNamespace( namespaceXML(nFlags) );
+ DWFString zNamespace1( namespaceXML(nFlags) );
- rSerializer.startElement( DWFXML::kzElement_ImageResource, zNamespace );
+ rSerializer.startElement( DWFXML::kzElement_ImageResource, zNamespace1 );
//
// let base class know not to start the element
@@ -845,14 +845,14 @@
DWFResourceRelationship::tList::Iterator *pIter = _oRelationships.iterator();
if (pIter)
{
- rSerializer.startElement( DWFXML::kzElement_Relationships, zNamespace );
+ rSerializer.startElement( DWFXML::kzElement_Relationships, zNamespace1 );
for (; pIter->valid(); pIter->next())
{
DWFResourceRelationship *pRelationship = pIter->get();
if(pRelationship != NULL)
{
- rSerializer.startElement( DWFXML::kzElement_Relationship, zNamespace );
+ rSerializer.startElement( DWFXML::kzElement_Relationship, zNamespace1 );
rSerializer.addAttribute( DWFXML::kzAttribute_ObjectID, pRelationship->resourceID() );
rSerializer.addAttribute( DWFXML::kzAttribute_Type, pRelationship->type());
rSerializer.endElement();
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/PropertySet.cpp
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/PropertySet.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/PropertySet.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -450,10 +450,10 @@
//
if (pMatchedSet == NULL)
{
- DWFPropertyContainer::tList::const_iterator iSet = _oReferences.begin();
- for (; iSet != _oReferences.end(); ++iSet)
+ DWFPropertyContainer::tList::const_iterator iSet1 = _oReferences.begin();
+ for (; iSet1 != _oReferences.end(); ++iSet1)
{
- DWFPropertySet* pSet = dynamic_cast<DWFPropertySet*>(*iSet);
+ DWFPropertySet* pSet = dynamic_cast<DWFPropertySet*>(*iSet1);
if ((eIDType == DWFPropertySet::eSchemaID) && (pSet->getSchemaID() == zID) ||
(eIDType == DWFPropertySet::eSetID) && (pSet->getSetID() == zID) ||
(eIDType == DWFPropertySet::eUUID) && (pSet->id() == zID))
@@ -522,15 +522,15 @@
//
DWFPropertySet::tList::iterator iBegin = oPropertySets.end();
- DWFPropertyContainer::tList::iterator iContainer = _oContainers.begin();
- for (; iContainer != _oContainers.end(); ++iContainer)
+ DWFPropertyContainer::tList::iterator iContainer1 = _oContainers.begin();
+ for (; iContainer1 != _oContainers.end(); ++iContainer1)
{
- oPropertySets.push_back( dynamic_cast<DWFPropertySet*>(*iContainer) );
+ oPropertySets.push_back( dynamic_cast<DWFPropertySet*>(*iContainer1) );
}
- iContainer = _oReferences.begin();
- for (; iContainer != _oReferences.end(); ++iContainer)
+ iContainer1 = _oReferences.begin();
+ for (; iContainer1 != _oReferences.end(); ++iContainer1)
{
- oPropertySets.push_back( dynamic_cast<DWFPropertySet*>(*iContainer) );
+ oPropertySets.push_back( dynamic_cast<DWFPropertySet*>(*iContainer1) );
}
DWFPropertySet::tList::iterator iEnd = oPropertySets.end();
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/Section.cpp
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/Section.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/Section.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -433,18 +433,18 @@
_DWFTK_API
void
DWFSection::getContentDefinition( DWFContentResourceReader& rReader,
- DWFResource* pResource )
+ DWFResource* pResource1 )
throw( DWFException )
{
- if (pResource)
+ if (pResource1)
{
- rReader.setResourceObjectID( pResource->objectID() );
+ rReader.setResourceObjectID( pResource1->objectID() );
//
// acquire the data feed from the resource directly and don't cache since hopefully the document is
// read only once and any useful data is collected by the implementation of the reader
//
- DWFPointer<DWFInputStream> apObjectStream( pResource->getInputStream(), false );
+ DWFPointer<DWFInputStream> apObjectStream( pResource1->getInputStream(), false );
//
// parse the descriptor
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/SectionContentResource.cpp
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/SectionContentResource.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/SectionContentResource.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -158,22 +158,22 @@
DWFSectionContentResource::getInputStream( bool /*bCache*/ )
throw( DWFException )
{
- DWFInputStream * pInputStream = DWFResource::getInputStream();
+ DWFInputStream * pInputStream1 = DWFResource::getInputStream();
if (_pContent == NULL )
{
_DWFCORE_THROW( DWFUnexpectedException, /*NOXLATE*/L"Content object is null" );
}
- if (!_pContent->isSectionContentResourceModified( objectID() ) || ( _bSerialized && pInputStream != NULL ))
+ if (!_pContent->isSectionContentResourceModified( objectID() ) || ( _bSerialized && pInputStream1 != NULL ))
{
- return pInputStream;
+ return pInputStream1;
}
else
{
- if (pInputStream != NULL )
+ if (pInputStream1 != NULL )
{
- DWFCORE_FREE_OBJECT(pInputStream);
+ DWFCORE_FREE_OBJECT(pInputStream1);
}
//
// create a buffered stream for serialization
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/reader/PackageReader.cpp
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/reader/PackageReader.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/reader/PackageReader.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -234,7 +234,7 @@
DWFString zRetVal;
// Look for the signature extension ".psdsxs"
- DWFString zMSXPS(OPCPackage::kzURI_PackageDigitalSignatureExt);
+ DWFString zMSXPS1(OPCPackage::kzURI_PackageDigitalSignatureExt);
off_t nPosLastSlash( zSourcePath.findLast(/* NOXLATE */'/') );
off_t nPosLastDot( zSourcePath.findLast(/* NOXLATE */'.') );
@@ -244,7 +244,7 @@
zRetVal = zSourcePath.substring(nPosLastDot);
}
// If it is the signature resource, check it out
- if (zRetVal == zMSXPS)
+ if (zRetVal == zMSXPS1)
{
// Get a stream to the resource
DWFPointer<DWFInputStream> spInstream ( this->extract( zSourcePath, false ), false );
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/writer/DWF6PackageWriter.cpp
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/writer/DWF6PackageWriter.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/writer/DWF6PackageWriter.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1533,9 +1533,9 @@
_tSignatureRequestVector::iterator iRequest = _oSignatureRequests.begin();
for (; iRequest != _oSignatureRequests.end(); ++iRequest)
{
- DWFSignatureRequest* pRequest = *iRequest;
+ DWFSignatureRequest* pRequest1 = *iRequest;
- DWFSignature::tReferenceVector::Iterator* piRef = pRequest->references();
+ DWFSignature::tReferenceVector::Iterator* piRef = pRequest1->references();
for ( ; piRef->valid(); piRef->next())
{
//
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/writer/DWFXPackageWriter.cpp
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/writer/DWFXPackageWriter.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/writer/DWFXPackageWriter.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -599,19 +599,19 @@
pPlotSection->addResource( pGraphicResource, true );
//DWFXFixedPageResourceExtractor
- off_t iOffset = zFPageURI.findLast( /*NOXLATE*/L'/' );
+ off_t iOffset1 = zFPageURI.findLast( /*NOXLATE*/L'/' );
- DWFString fileName;
+ DWFString fileName1;
DWFString fRelsURI;
- if (iOffset != -1 &&
- size_t(iOffset+1) != zFPageURI.chars())
+ if (iOffset1 != -1 &&
+ size_t(iOffset1+1) != zFPageURI.chars())
{
- size_t iExtLen = zFPageURI.chars()-(iOffset+1);
- fileName = zFPageURI.substring( iOffset+1, iExtLen);
+ size_t iExtLen = zFPageURI.chars()-(iOffset1+1);
+ fileName1 = zFPageURI.substring( iOffset1+1, iExtLen);
- fRelsURI = zFPageURI.substring(0, iOffset + 1);
+ fRelsURI = zFPageURI.substring(0, iOffset1 + 1);
fRelsURI.append(/*NOXLATE*/L"_rels/");
- fRelsURI.append(fileName);
+ fRelsURI.append(fileName1);
fRelsURI.append(/*NOXLATE*/L".rels");
}
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/writer/PackageWriter.cpp
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/writer/PackageWriter.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/package/writer/PackageWriter.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -450,10 +450,10 @@
// or merge. So lets count the number of associated contents first before we proceed.
//
DWFSortedVector<DWFString> oContentIDs( false );
- _tSectionToContentManager::iterator iMap = _oSectionToContentManager.begin();
- for (; iMap != _oSectionToContentManager.end(); ++iMap)
+ _tSectionToContentManager::iterator iMap1 = _oSectionToContentManager.begin();
+ for (; iMap1 != _oSectionToContentManager.end(); ++iMap1)
{
- DWFSection* pSection = iMap->first;
+ DWFSection* pSection = iMap1->first;
DWFSection::tStringMultiMap oResourceIDContentID;
pSection->getAssociatedContentIDs( oResourceIDContentID );
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/presentation/ContentPresentationResource.cpp
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/presentation/ContentPresentationResource.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/presentation/ContentPresentationResource.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -98,22 +98,22 @@
//
// if we have not processed the input stream yet then just get the stream from the base class
//
- DWFInputStream * pInputStream = DWFResource::getInputStream();
+ DWFInputStream * pInputStream1 = DWFResource::getInputStream();
DWFContentPresentation::tList::Iterator* piPresentations = getPresentations();
if (piPresentations == NULL || !piPresentations->valid())
{
DWFCORE_FREE_OBJECT( piPresentations );
- return pInputStream;
+ return pInputStream1;
}
- else if( _bSerialized && pInputStream != NULL )
+ else if( _bSerialized && pInputStream1 != NULL )
{
- return pInputStream;
+ return pInputStream1;
}
else
{
- if (pInputStream != NULL )
+ if (pInputStream1 != NULL )
{
- DWFCORE_FREE_OBJECT(pInputStream);
+ DWFCORE_FREE_OBJECT(pInputStream1);
}
DWFCORE_FREE_OBJECT( piPresentations );
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/presentation/reader/ContentPresentationReader.cpp
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/presentation/reader/ContentPresentationReader.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/presentation/reader/ContentPresentationReader.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1109,10 +1109,10 @@
if ((_nProviderFlags & eProvideModelViewNodes)
&& DWFCORE_COMPARE_ASCII_STRINGS(zName, DWFXML::kzElement_ModelViewNode) == 0)
{
- DWFContentPresentationModelViewNode *pModelViewNode = dynamic_cast<DWFContentPresentationModelViewNode *>(_pCurrentNode);
- if(pModelViewNode != NULL)
+ DWFContentPresentationModelViewNode *pModelViewNode1 = dynamic_cast<DWFContentPresentationModelViewNode *>(_pCurrentNode);
+ if(pModelViewNode1 != NULL)
{
- pModelViewNode->close();
+ pModelViewNode1->close();
}
//
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/publisher/impl/PublishedContentElement.cpp
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/publisher/impl/PublishedContentElement.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/publisher/impl/PublishedContentElement.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -385,10 +385,10 @@
// segment.
//
DWFEntity* pEntity = NULL;
- DWFPublishedObject::tReference* pRef = rPubElement.getNamedSegmentIncludeRef();
- if (pRef)
+ DWFPublishedObject::tReference* pRef1 = rPubElement.getNamedSegmentIncludeRef();
+ if (pRef1)
{
- pEntity = _getReferencedEntity( pRef->pObj );
+ pEntity = _getReferencedEntity( pRef1->pObj );
}
else
{
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/w3dtk/BAscii.cpp
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/w3dtk/BAscii.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/w3dtk/BAscii.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -7677,7 +7677,7 @@
PutTab t0(&tk);
- int length;
+ int length1;
switch (m_stage) {
case 0: {
if ((status = PutAsciiOpcode (tk,1)) != TK_Normal)
@@ -7784,15 +7784,15 @@
case 9: {
PutTab t(&tk);
if ((m_channels & (1 << TKO_Channel_Specular)) != 0) {
- length = 0; // if no string, zero indicates by-value
+ length1 = 0; // if no string, zero indicates by-value
if (m_specular.m_name != null) {
- length = (int)strlen (m_specular.m_name);
- if (length > 255)
+ length1 = (int)strlen (m_specular.m_name);
+ if (length1 > 255)
return tk.Error(">255 specular texture not yet supported");
}
- if ((status = PutAsciiData (tk,"Length", length)) != TK_Normal)
+ if ((status = PutAsciiData (tk,"Length", length1)) != TK_Normal)
return status;
}
m_stage++;
@@ -7818,15 +7818,15 @@
case 11: {
PutTab t(&tk);
if ((m_channels & (1 << TKO_Channel_Mirror)) != 0) {
- length = 0; // if no string, zero indicates by-value
+ length1 = 0; // if no string, zero indicates by-value
if (m_mirror.m_name != null) {
- length = (int) strlen (m_mirror.m_name);
- if (length > 255)
+ length1 = (int) strlen (m_mirror.m_name);
+ if (length1 > 255)
return tk.Error(">255 mirror texture not yet supported");
}
- if ((status = PutAsciiData (tk,"Length", length)) != TK_Normal)
+ if ((status = PutAsciiData (tk,"Length", length1)) != TK_Normal)
return status;
}
m_stage++;
@@ -7852,14 +7852,14 @@
case 13: {
PutTab t(&tk);
if ((m_channels & (1 << TKO_Channel_Transmission)) != 0) {
- length = 0;
+ length1 = 0;
if (m_transmission.m_name != null) {
- length = (int) strlen (m_transmission.m_name);
- if (length > 255)
+ length1 = (int) strlen (m_transmission.m_name);
+ if (length1 > 255)
return tk.Error(">255 transmission texture not yet supported");
}
- if ((status = PutAsciiData (tk,"Length", length)) != TK_Normal)
+ if ((status = PutAsciiData (tk,"Length", length1)) != TK_Normal)
return status;
}
m_stage++;
@@ -7885,15 +7885,15 @@
case 15: {
PutTab t(&tk);
if ((m_channels & (1 << TKO_Channel_Emission)) != 0) {
- length = 0; // if no string, zero indicates by-value
+ length1 = 0; // if no string, zero indicates by-value
if (m_emission.m_name != null) {
- length = (int) strlen (m_emission.m_name);
- if (length > 255)
+ length1 = (int) strlen (m_emission.m_name);
+ if (length1 > 255)
return tk.Error(">255 emission texture not yet supported");
}
- if ((status = PutAsciiData (tk,"Length", length)) != TK_Normal)
+ if ((status = PutAsciiData (tk,"Length", length1)) != TK_Normal)
return status;
}
m_stage++;
@@ -7939,15 +7939,15 @@
case 19: {
PutTab t(&tk);
if ((m_channels & (1 << TKO_Channel_Environment)) != 0) {
- length = 0;
+ length1 = 0;
if (m_environment.m_name != null) {
- length = (int) strlen (m_environment.m_name);
- if (length > 255)
+ length1 = (int) strlen (m_environment.m_name);
+ if (length1 > 255)
return tk.Error(">255 environment texture not yet supported");
}
- if ((status = PutAsciiData (tk,"Length", length)) != TK_Normal)
+ if ((status = PutAsciiData (tk,"Length", length1)) != TK_Normal)
return status;
}
m_stage++;
@@ -7966,15 +7966,15 @@
case 21: {
PutTab t(&tk);
if ((m_channels & (1 << TKO_Channel_Bump)) != 0) {
- length = 0;
+ length1 = 0;
if (m_bump.m_name != null) {
- length = (int) strlen (m_bump.m_name);
- if (length > 255)
+ length1 = (int) strlen (m_bump.m_name);
+ if (length1 > 255)
return tk.Error(">255 bump texture not yet supported");
}
- if ((status = PutAsciiData (tk,"Length", length)) != TK_Normal)
+ if ((status = PutAsciiData (tk,"Length", length1)) != TK_Normal)
return status;
}
m_stage++;
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/w3dtk/BOpcodeHandler.cpp
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/w3dtk/BOpcodeHandler.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/w3dtk/BOpcodeHandler.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -7591,7 +7591,7 @@
TK_Status TK_Color::Write (BStreamFileToolkit & tk) alter {
#ifndef BSTREAM_READONLY
TK_Status status = TK_Normal;
- int length;
+ int length1;
#ifndef BSTREAM_DISABLE_ASCII
if (tk.GetAsciiMode())
@@ -7729,10 +7729,10 @@
unsigned char byte = 0;
if (m_specular.m_name != null) {
- length = (int)strlen (m_specular.m_name);
- if (length > 255)
+ length1 = (int)strlen (m_specular.m_name);
+ if (length1 > 255)
return tk.Error(">255 specular texture not yet supported");
- byte = (unsigned char) length;
+ byte = (unsigned char) length1;
}
if ((status = PutData (tk, byte)) != TK_Normal)
return status;
@@ -7763,10 +7763,10 @@
unsigned char byte = 0;
if (m_mirror.m_name != null) {
- length = (int) strlen (m_mirror.m_name);
- if (length > 255)
+ length1 = (int) strlen (m_mirror.m_name);
+ if (length1 > 255)
return tk.Error(">255 mirror texture not yet supported");
- byte = (unsigned char) length;
+ byte = (unsigned char) length1;
}
if ((status = PutData (tk, byte)) != TK_Normal)
@@ -7798,10 +7798,10 @@
unsigned char byte = 0;
if (m_transmission.m_name != null) {
- length = (int) strlen (m_transmission.m_name);
- if (length > 255)
+ length1 = (int) strlen (m_transmission.m_name);
+ if (length1 > 255)
return tk.Error(">255 transmission texture not yet supported");
- byte = (unsigned char) length;
+ byte = (unsigned char) length1;
}
if ((status = PutData (tk, byte)) != TK_Normal)
@@ -7833,10 +7833,10 @@
unsigned char byte = 0;
if (m_emission.m_name != null) {
- length = (int) strlen (m_emission.m_name);
- if (length > 255)
+ length1 = (int) strlen (m_emission.m_name);
+ if (length1 > 255)
return tk.Error(">255 emission texture not yet supported");
- byte = (unsigned char) length;
+ byte = (unsigned char) length1;
}
if ((status = PutData (tk, byte)) != TK_Normal)
return status;
@@ -7883,10 +7883,10 @@
unsigned char byte = 0;
if (m_environment.m_name != null) {
- length = (int) strlen (m_environment.m_name);
- if (length > 255)
+ length1 = (int) strlen (m_environment.m_name);
+ if (length1 > 255)
return tk.Error(">255 environment texture not yet supported");
- byte = (unsigned char) length;
+ byte = (unsigned char) length1;
}
if ((status = PutData (tk, byte)) != TK_Normal)
return status;
@@ -7907,10 +7907,10 @@
unsigned char byte = 0;
if (m_bump.m_name != null) {
- length = (int) strlen (m_bump.m_name);
- if (length > 255)
+ length1 = (int) strlen (m_bump.m_name);
+ if (length1 > 255)
return tk.Error(">255 bump texture not yet supported");
- byte = (unsigned char) length;
+ byte = (unsigned char) length1;
}
if ((status = PutData (tk, byte)) != TK_Normal)
@@ -14243,7 +14243,7 @@
TK_Status TK_Text_Font::Read (BStreamFileToolkit & tk) alter {
TK_Status status = TK_Normal;
- unsigned char byte;
+ unsigned char byte1;
unsigned short word;
#ifndef BSTREAM_DISABLE_ASCII
if (tk.GetAsciiMode())
@@ -14251,33 +14251,33 @@
#endif
switch (m_stage) {
case 0: {
- if ((status = GetData (tk, byte)) != TK_Normal)
+ if ((status = GetData (tk, byte1)) != TK_Normal)
return status;
- m_mask = byte;
+ m_mask = byte1;
m_stage++;
} nobreak;
case 1: {
- if ((status = GetData (tk, byte)) != TK_Normal)
+ if ((status = GetData (tk, byte1)) != TK_Normal)
return status;
- m_value = byte;
+ m_value = byte1;
m_stage++;
} nobreak;
case 2: {
if ((m_mask & TKO_Font_Extended) != 0) {
- if ((status = GetData (tk, byte)) != TK_Normal)
+ if ((status = GetData (tk, byte1)) != TK_Normal)
return status;
- m_mask |= byte << 8;
+ m_mask |= byte1 << 8;
}
m_stage++;
} nobreak;
case 3: {
if ((m_mask & TKO_Font_Extended) != 0) {
- if ((status = GetData (tk, byte)) != TK_Normal)
+ if ((status = GetData (tk, byte1)) != TK_Normal)
return status;
- m_value |= byte << 8;
+ m_value |= byte1 << 8;
}
m_stage++;
} nobreak;
@@ -14302,9 +14302,9 @@
case 6: {
if ((m_mask & m_value & TKO_Font_Names) != 0) {
- if ((status = GetData (tk, byte)) != TK_Normal)
+ if ((status = GetData (tk, byte1)) != TK_Normal)
return status;
- m_names_length = byte;
+ m_names_length = byte1;
SetNames (m_names_length);
}
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/w3dtk/BPolyhedronAscii.cpp
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/w3dtk/BPolyhedronAscii.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/w3dtk/BPolyhedronAscii.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -9023,12 +9023,12 @@
}
temp_opcode[len] = 0;
- int i;
- for ( i=0; i<256; i++ ) {
- if ( strni_equal( (const char *)& temp_opcode[4], (const char *)opcode_list[i],(word_count)) == true )
+ int j;
+ for ( j=0; j<256; j++ ) {
+ if ( strni_equal( (const char *)& temp_opcode[4], (const char *)opcode_list[j],(word_count)) == true )
break; // found opcode
}
- opcode = (unsigned char)i;
+ opcode = (unsigned char)j;
word_count = 0;
// End of added code
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/whiptk/typedefs_defines.h
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/whiptk/typedefs_defines.h 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwf/whiptk/typedefs_defines.h 2015-09-21 04:22:58 UTC (rev 8760)
@@ -75,6 +75,8 @@
/// \brief An alias for a GUID.
typedef WD_GUID WD_UUID;
+#pragma warning (disable : 4456) //suppress "warning C4456: declaration of some variable hides previous local declaration"
+
#define WD_NO_COLOR_INDEX -1
#define WD_Null NULL
#define WD_False (static_cast<WT_Boolean>(0))
Modified: trunk/MgDev/Oem/DWFTK/develop/global/src/dwfcore/win32/Core.cpp
===================================================================
--- trunk/MgDev/Oem/DWFTK/develop/global/src/dwfcore/win32/Core.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/DWFTK/develop/global/src/dwfcore/win32/Core.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -69,6 +69,7 @@
OSVERSIONINFO tInfo;
tInfo.dwOSVersionInfoSize = sizeof( OSVERSIONINFO );
+#pragma warning (disable : 4996) //suppress "warning C4996: 'GetVersionExW': was declared deprecated"
::GetVersionEx( &tInfo );
return (tInfo.dwPlatformId & VER_PLATFORM_WIN32_WINDOWS);
Modified: trunk/MgDev/Oem/LinuxApt/php-5.5.17.tar.bz2
===================================================================
(Binary files differ)
Modified: trunk/MgDev/Oem/SQLite/src/SQLite3/SQLite.vcxproj
===================================================================
--- trunk/MgDev/Oem/SQLite/src/SQLite3/SQLite.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/SQLite/src/SQLite3/SQLite.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,24 +27,24 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CLRSupport>false</CLRSupport>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
<CLRSupport>false</CLRSupport>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/SQLite/src/SQLitePhpApi/SQLitePhpApi.vcxproj
===================================================================
--- trunk/MgDev/Oem/SQLite/src/SQLitePhpApi/SQLitePhpApi.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/SQLite/src/SQLitePhpApi/SQLitePhpApi.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/SQLite/src/SQLiteUnitTest/SQLiteUnitTest.vcxproj
===================================================================
--- trunk/MgDev/Oem/SQLite/src/SQLiteUnitTest/SQLiteUnitTest.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/SQLite/src/SQLiteUnitTest/SQLiteUnitTest.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/SQLite/src/SqliteDotNet/SqliteDotNet.cpp
===================================================================
--- trunk/MgDev/Oem/SQLite/src/SqliteDotNet/SqliteDotNet.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/SQLite/src/SqliteDotNet/SqliteDotNet.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -26,14 +26,14 @@
using namespace System::Runtime::InteropServices;
-wstring SToWs(System::String* str)
+wstring SToWs(System::String^ str)
{
System::IntPtr strPtr = Marshal::StringToCoTaskMemUni(str);
wstring retStr = (wchar_t*) strPtr.ToPointer();
return retStr;
}
-System::String* WsToS(wstring str)
+System::String^ WsToS(wstring str)
{
System::IntPtr ptr((void*)str.c_str());
return Marshal::PtrToStringUni(ptr);
@@ -74,9 +74,9 @@
}
///Returns current error message
-System::String* SqliteDb::GetErrMsg()
+System::String^ SqliteDb::GetErrMsg()
{
- System::String* str = NULL;
+ System::String^ str = nullptr;
if (database != NULL)
{
wstring msg = database->GetErrMsg();
@@ -86,9 +86,9 @@
}
///Returns the database name
-System::String* SqliteDb::GetName()
+System::String^ SqliteDb::GetName()
{
- System::String* str = NULL;
+ System::String^ str = nullptr;
if (database != NULL)
{
wstring msg = database->GetName();
@@ -108,7 +108,7 @@
}
///Initializes a database object
-int SqliteDb::Open(System::String* newName)
+int SqliteDb::Open(System::String^ newName)
{
if (database != NULL)
{
@@ -119,7 +119,7 @@
}
///Dumps binary SQLite database into a SQL text format.
-void SqliteDb::DumpDatabase(System::String* iniFileName)
+void SqliteDb::DumpDatabase(System::String^ iniFileName)
{
if (database != NULL)
{
@@ -129,7 +129,7 @@
}
///Generates binary database from a SQL text file
-void SqliteDb::GenerateDatabase(System::String* dumpFileName, System::String* dbFileName)
+void SqliteDb::GenerateDatabase(System::String^ dumpFileName, System::String^ dbFileName)
{
if (database != NULL)
{
@@ -145,7 +145,7 @@
}
///Overloaded constructor that initializes the database connection
-SqliteVm::SqliteVm(SqliteDb* newDb, bool noThrow)
+SqliteVm::SqliteVm(SqliteDb^ newDb, bool noThrow)
{
vm = new SqliteVM(newDb->Database(), noThrow);
}
@@ -161,9 +161,9 @@
};
///Returns the name of the column specified
-System::String* SqliteVm::ColumnName(int colNum)
+System::String^ SqliteVm::ColumnName(int colNum)
{
- System::String* str = NULL;
+ System::String^ str = nullptr;
if (vm != NULL)
{
wstring wstr = vm->ColumnName(colNum);
@@ -172,7 +172,7 @@
return str;
}
-int SqliteVm::ColumnNumber(System::String* colName)
+int SqliteVm::ColumnNumber(System::String^ colName)
{
int num = -1;
if (vm != NULL)
@@ -184,9 +184,9 @@
}
///Returns the type of the column specified
-System::String* SqliteVm::ColumnType(System::String* colName)
+System::String^ SqliteVm::ColumnType(System::String^ colName)
{
- System::String* str = NULL;
+ System::String^ str = nullptr;
if (vm != NULL)
{
wstring wstrIn = SToWs(colName);
@@ -197,7 +197,7 @@
}
///Executes a query. Creates a new virtual machine
-int SqliteVm::Execute(System::String* newQuery)
+int SqliteVm::Execute(System::String^ newQuery)
{
int sqlErr = SQLITE_ERROR;
if (vm != NULL)
@@ -209,9 +209,9 @@
}
///Returns the sql query being executed
-System::String* SqliteVm::GetSqlQuery()
+System::String^ SqliteVm::GetSqlQuery()
{
- System::String* str = NULL;
+ System::String^ str = nullptr;
if (vm != NULL)
{
wstring wstr = vm->GetSqlQuery();
@@ -221,9 +221,9 @@
}
///Returns the tail of an SQL query
-System::String* SqliteVm::GetQueryTail()
+System::String^ SqliteVm::GetQueryTail()
{
- System::String* str = NULL;
+ System::String^ str = nullptr;
if (vm != NULL)
{
wstring wstr = vm->GetQueryTail();
@@ -233,7 +233,7 @@
}
///Returns an integer
-int SqliteVm::GetInt(System::String* colName)
+int SqliteVm::GetInt(System::String^ colName)
{
int ret = 0;
if (vm != NULL)
@@ -245,9 +245,9 @@
}
///Returns a string
-System::String* SqliteVm::GetString(System::String* colName)
+System::String^ SqliteVm::GetString(System::String^ colName)
{
- System::String* ret = NULL;
+ System::String^ ret = nullptr;
if (vm != NULL)
{
wstring wstrIn = SToWs(colName);
@@ -258,7 +258,7 @@
}
///Returns double
-double SqliteVm::GetDouble(System::String* colName)
+double SqliteVm::GetDouble(System::String^ colName)
{
double ret = 0;
if (vm != NULL)
@@ -270,9 +270,9 @@
}
///Returns BLOB
-SqliteGcBlob* SqliteVm::GetBlob(System::String* colName)
+SqliteGcBlob^ SqliteVm::GetBlob(System::String^ colName)
{
- SqliteGcBlob* blob = NULL;
+ SqliteGcBlob^ blob = nullptr;
if (vm != NULL)
{
@@ -281,7 +281,7 @@
SqliteBlob* tmpBlob = vm->GetBlob(wstrIn);
if (tmpBlob != NULL)
{
- blob = new SqliteGcBlob(tmpBlob);
+ blob = gcnew SqliteGcBlob(tmpBlob);
}
}
return blob;
@@ -299,9 +299,9 @@
}
///Returns an error message
-System::String* SqliteVm::GetErrMsg()
+System::String^ SqliteVm::GetErrMsg()
{
- System::String* ret = NULL;
+ System::String^ ret = nullptr;
if (vm != NULL)
{
wstring wstr = vm->GetErrMsg();
@@ -370,7 +370,7 @@
this->blob = blob;
}
-System::Byte SqliteGcBlob::Read()[]
+cli::array<System::Byte>^ SqliteGcBlob::Read()
{
int bufSize = 0;
char* buf = NULL;
@@ -394,12 +394,12 @@
nBytes = blob->Read(tmpBuf, 8192);
}
+
+ cli::array<System::Byte>^ bytes = nullptr;
- System::Byte bytes[] = NULL;
-
if (bufSize > 0)
{
- bytes = new System::Byte[bufSize];
+ bytes = gcnew cli::array<System::Byte>(bufSize);
System::IntPtr bufPtr(buf);
Marshal::Copy(bufPtr, bytes, 0, bufSize);
delete [] buf;
Modified: trunk/MgDev/Oem/SQLite/src/SqliteDotNet/SqliteDotNet.h
===================================================================
--- trunk/MgDev/Oem/SQLite/src/SqliteDotNet/SqliteDotNet.h 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/SQLite/src/SqliteDotNet/SqliteDotNet.h 2015-09-21 04:22:58 UTC (rev 8760)
@@ -25,16 +25,16 @@
namespace SqliteDotNet
{
- public __gc class SqliteGcBlob
+ public ref class SqliteGcBlob
{
public:
SqliteGcBlob(SqliteBlob* blob);
- System::Byte Read()[];
+ cli::array<System::Byte>^ Read();
private:
SqliteBlob* blob;
};
- public __gc class Sqlite
+ public ref class Sqlite
{
public:
static const int Ok = 0;
@@ -43,7 +43,7 @@
static const int Done = 101;
};
- public __gc class SqliteDb
+ public ref class SqliteDb
{
public:
///Default constructor
@@ -56,22 +56,22 @@
int Close();
///Returns current error message
- System::String* GetErrMsg();
+ System::String^ GetErrMsg();
///Returns the database name
- System::String* GetName();
+ System::String^ GetName();
///Checks if there exist connection
bool IsConnected();
///Initializes a database object
- int Open(System::String* newName);
+ int Open(System::String^ newName);
///Dumps binary SQLite database into a SQL text format.
- void DumpDatabase(System::String* iniFileName);
+ void DumpDatabase(System::String^ iniFileName);
///Generates binary database from a SQL text file
- void GenerateDatabase(System::String* dumpFileName, System::String* dbFileName);
+ void GenerateDatabase(System::String^ dumpFileName, System::String^ dbFileName);
SqliteDB* Database();
@@ -80,49 +80,49 @@
};
- public __gc class SqliteVm
+ public ref class SqliteVm
{
public:
///Overloaded constructor that initializes the database connection
- SqliteVm(SqliteDb* newDb, bool noThrow);
+ SqliteVm(SqliteDb^ newDb, bool noThrow);
//Destructor. Deletes the virtual machine
~SqliteVm();
///Returns the name of the column specified
- System::String* ColumnName(int colNum);
+ System::String^ ColumnName(int colNum);
- int ColumnNumber(System::String* colName);
+ int ColumnNumber(System::String^ colName);
///Returns the type of the column specified
- System::String* ColumnType(System::String* colName);
+ System::String^ ColumnType(System::String^ colName);
///Executes a query. Creates a new virtual machine
- int Execute(System::String* newQuery); // do compile and first step here
+ int Execute(System::String^ newQuery); // do compile and first step here
///Returns the sql query being executed
- System::String* GetSqlQuery();
+ System::String^ GetSqlQuery();
///Returns the tail of an SQL query
- System::String* GetQueryTail();
+ System::String^ GetQueryTail();
///Returns an integer
- int GetInt(System::String* colName);
+ int GetInt(System::String^ colName);
///Returns a string
- System::String* GetString(System::String* colName);
+ System::String^ GetString(System::String^ colName);
///Returns double
- double GetDouble(System::String* colName);
+ double GetDouble(System::String^ colName);
///Returns BLOB
- SqliteGcBlob* GetBlob(System::String* colName);
+ SqliteGcBlob^ GetBlob(System::String^ colName);
///Returns the number of columns in a table
int NumCols();
///Returns an error message
- System::String* GetErrMsg();
+ System::String^ GetErrMsg();
///Checks if the database objects is still connected to a database
bool IsConnected();
Modified: trunk/MgDev/Oem/SQLite/src/SqliteDotNet/SqliteDotNet.vcxproj
===================================================================
--- trunk/MgDev/Oem/SQLite/src/SqliteDotNet/SqliteDotNet.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/SQLite/src/SqliteDotNet/SqliteDotNet.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -22,31 +22,32 @@
<ProjectGuid>{82BAB86A-BBDE-42F3-B0BD-E69CDF1E8119}</ProjectGuid>
<RootNamespace>SqliteDotNet</RootNamespace>
<Keyword>ManagedCProj</Keyword>
+ <TargetPlatformVersion>10.0.10069.0</TargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <CLRSupport>OldSyntax</CLRSupport>
- <PlatformToolset>v110</PlatformToolset>
+ <CLRSupport>true</CLRSupport>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <CLRSupport>OldSyntax</CLRSupport>
- <PlatformToolset>v110</PlatformToolset>
+ <CLRSupport>true</CLRSupport>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <CLRSupport>OldSyntax</CLRSupport>
- <PlatformToolset>v110</PlatformToolset>
+ <CLRSupport>true</CLRSupport>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <CLRSupport>OldSyntax</CLRSupport>
- <PlatformToolset>v110</PlatformToolset>
+ <CLRSupport>true</CLRSupport>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -100,7 +101,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>mscoree.lib;msvcmrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>msvcrtd.lib;mscoree.lib;msvcmrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
@@ -110,6 +111,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -128,7 +130,7 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>mscoree.lib;msvcmrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>msvcrtd.lib;mscoree.lib;msvcmrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
@@ -138,6 +140,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -152,12 +155,13 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>mscoree.lib;msvcmrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>msvcrt.lib;mscoree.lib;msvcmrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX86</TargetMachine>
+ <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -175,12 +179,13 @@
<MultiProcessorCompilation>true</MultiProcessorCompilation>
</ClCompile>
<Link>
- <AdditionalDependencies>mscoree.lib;msvcmrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalDependencies>msvcrt.lib;mscoree.lib;msvcmrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<RandomizedBaseAddress>false</RandomizedBaseAddress>
<DataExecutionPrevention>
</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
+ <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
Modified: trunk/MgDev/Oem/SQLite/src/SqliteVM/sqliteVM.vcxproj
===================================================================
--- trunk/MgDev/Oem/SQLite/src/SqliteVM/sqliteVM.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/SQLite/src/SqliteVM/sqliteVM.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_archive.vcxproj
===================================================================
--- trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_archive.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_archive.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -33,35 +33,35 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_checkpoint.vcxproj
===================================================================
--- trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_checkpoint.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_checkpoint.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -33,35 +33,35 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_dll.vcxproj
===================================================================
--- trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_dll.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_dll.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -28,27 +28,27 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>false</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<WholeProgramOptimization>false</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_dump.vcxproj
===================================================================
--- trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_dump.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_dump.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -33,35 +33,35 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_hotbackup.vcxproj
===================================================================
--- trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_hotbackup.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_hotbackup.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -33,35 +33,35 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_load.vcxproj
===================================================================
--- trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_load.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_load.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -33,35 +33,35 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_recover.vcxproj
===================================================================
--- trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_recover.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_recover.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -33,35 +33,35 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_upgrade.vcxproj
===================================================================
--- trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_upgrade.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_upgrade.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -33,35 +33,35 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_verify.vcxproj
===================================================================
--- trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_verify.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/dbxml/db-4.8.26/build_windows/db_verify.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -33,35 +33,35 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Template|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/dbxml/dbxml/build_windows/dbxml.vcxproj
===================================================================
--- trunk/MgDev/Oem/dbxml/dbxml/build_windows/dbxml.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/dbxml/dbxml/build_windows/dbxml.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -43,43 +43,43 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/dbxml/dbxml/build_windows/dbxml_dump.vcxproj
===================================================================
--- trunk/MgDev/Oem/dbxml/dbxml/build_windows/dbxml_dump.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/dbxml/dbxml/build_windows/dbxml_dump.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,21 +27,21 @@
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/dbxml/dbxml/build_windows/dbxml_load.vcxproj
===================================================================
--- trunk/MgDev/Oem/dbxml/dbxml/build_windows/dbxml_load.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/dbxml/dbxml/build_windows/dbxml_load.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,21 +27,21 @@
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/dbxml/dbxml/build_windows/dbxml_shell.vcxproj
===================================================================
--- trunk/MgDev/Oem/dbxml/dbxml/build_windows/dbxml_shell.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/dbxml/dbxml/build_windows/dbxml_shell.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -43,41 +43,41 @@
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/dbxml/dbxml/src/dbxml/nodeStore/NsXercesTranscoder.cpp
===================================================================
--- trunk/MgDev/Oem/dbxml/dbxml/src/dbxml/nodeStore/NsXercesTranscoder.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/dbxml/dbxml/src/dbxml/nodeStore/NsXercesTranscoder.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -206,7 +206,7 @@
bool needsEscape = false;
if (!len)
len = NsUtil::nsStringLen(characters);
- enum checkType ttype = (isCDATA || ignorable) ? ignore : isCharacters;
+ enum checkType ttype = (isCDATA || ignorable) ? checkType::ignore : isCharacters;
NsDonator chars(characters, len, ttype);
uint32_t textType;
if (isCDATA)
Modified: trunk/MgDev/Oem/dbxml/xerces-c-src/projects/Win32/VS/xerces-all/XercesLib/XercesLib.vcxproj
===================================================================
--- trunk/MgDev/Oem/dbxml/xerces-c-src/projects/Win32/VS/xerces-all/XercesLib/XercesLib.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/dbxml/xerces-c-src/projects/Win32/VS/xerces-all/XercesLib/XercesLib.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -59,65 +59,65 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ICU Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ICU Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ICU Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/dbxml/xqilla/Win32Projects/VS/xqilla.vcxproj
===================================================================
--- trunk/MgDev/Oem/dbxml/xqilla/Win32Projects/VS/xqilla.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/dbxml/xqilla/Win32Projects/VS/xqilla.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -67,7 +67,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -78,7 +78,7 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -89,7 +89,7 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
@@ -100,7 +100,7 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -123,25 +123,25 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Static Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/dbxml/xqilla/include/xqilla/framework/XPath2MemoryManager.hpp
===================================================================
--- trunk/MgDev/Oem/dbxml/xqilla/include/xqilla/framework/XPath2MemoryManager.hpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/dbxml/xqilla/include/xqilla/framework/XPath2MemoryManager.hpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -132,7 +132,7 @@
#endif
#if _MSC_VER >= 1700
// Needed for Vistual Studio 2012
- bool operator ==(const XQillaAllocator<_Tp>& o)
+ bool operator ==(const XQillaAllocator<_Tp>& o) const
{
if (_memMgr == o._memMgr)
return true;
Modified: trunk/MgDev/Oem/gd/build/win32/gd/gd.vcxproj
===================================================================
--- trunk/MgDev/Oem/gd/build/win32/gd/gd.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/gd/build/win32/gd/gd.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/gd/freetype/builds/win32/visualc/freetype.vcxproj
===================================================================
--- trunk/MgDev/Oem/gd/freetype/builds/win32/visualc/freetype.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/gd/freetype/builds/win32/visualc/freetype.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug Multithreaded|Win32">
<Configuration>Debug Multithreaded</Configuration>
@@ -59,73 +59,73 @@
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Multithreaded|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug Singlethreaded|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Singlethreaded|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release Multithreaded|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/gd/freetype/include/freetype/freetype.h
===================================================================
--- trunk/MgDev/Oem/gd/freetype/include/freetype/freetype.h 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/gd/freetype/include/freetype/freetype.h 2015-09-21 04:22:58 UTC (rev 8760)
@@ -911,7 +911,7 @@
FT_Int num_charmaps;
FT_CharMap* charmaps;
- FT_Generic generic;
+ FT_Generic genericFT;
/*# The following member variables (down to `underline_thickness') */
/*# are only relevant to scalable outlines; cf. @FT_Bitmap_Size */
@@ -1312,7 +1312,7 @@
typedef struct FT_SizeRec_
{
FT_Face face; /* parent face object */
- FT_Generic generic; /* generic pointer for client uses */
+ FT_Generic genericFT; /* generic pointer for client uses */
FT_Size_Metrics metrics; /* size metrics */
FT_Size_Internal internal;
@@ -1520,7 +1520,7 @@
FT_Face face;
FT_GlyphSlot next;
FT_UInt reserved; /* retained for binary compatibility */
- FT_Generic generic;
+ FT_Generic genericFT;
FT_Glyph_Metrics metrics;
FT_Fixed linearHoriAdvance;
Modified: trunk/MgDev/Oem/gd/freetype/src/base/ftobjs.c
===================================================================
--- trunk/MgDev/Oem/gd/freetype/src/base/ftobjs.c 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/gd/freetype/src/base/ftobjs.c 2015-09-21 04:22:58 UTC (rev 8760)
@@ -764,8 +764,8 @@
FT_Driver driver )
{
/* finalize client-specific data */
- if ( size->generic.finalizer )
- size->generic.finalizer( size );
+ if ( size->genericFT.finalizer )
+ size->genericFT.finalizer( size );
/* finalize format-specific stuff */
if ( driver->clazz->done_size )
@@ -831,8 +831,8 @@
face->size = 0;
/* now discard client data */
- if ( face->generic.finalizer )
- face->generic.finalizer( face );
+ if ( face->genericFT.finalizer )
+ face->genericFT.finalizer( face );
/* discard charmaps */
destroy_charmaps( face, memory );
Modified: trunk/MgDev/Oem/gd/jpeg/jpeg.vcxproj
===================================================================
--- trunk/MgDev/Oem/gd/jpeg/jpeg.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/gd/jpeg/jpeg.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/gd/lpng/projects/vs/libpng.vcxproj
===================================================================
--- trunk/MgDev/Oem/gd/lpng/projects/vs/libpng.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/gd/lpng/projects/vs/libpng.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="DLL ASM Debug|Win32">
<Configuration>DLL ASM Debug</Configuration>
@@ -81,75 +81,75 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB ASM Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB ASM Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL VB|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL ASM Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL ASM Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB ASM Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB ASM Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL VB|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL ASM Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL ASM Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -934,4 +934,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: trunk/MgDev/Oem/gd/lpng/projects/vs/zlib.vcxproj
===================================================================
--- trunk/MgDev/Oem/gd/lpng/projects/vs/zlib.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/gd/lpng/projects/vs/zlib.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="DLL ASM Debug|Win32">
<Configuration>DLL ASM Debug</Configuration>
@@ -73,67 +73,67 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB ASM Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB ASM Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL ASM Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL ASM Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB ASM Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB ASM Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='LIB Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL ASM Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL ASM Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -788,4 +788,4 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</ImportGroup>
-</Project>
+</Project>
\ No newline at end of file
Modified: trunk/MgDev/Oem/geos/VisualStudio/GEOS.vcxproj
===================================================================
--- trunk/MgDev/Oem/geos/VisualStudio/GEOS.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/geos/VisualStudio/GEOS.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -45,49 +45,49 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='MinSizeRel|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='RelWithDebInfo|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<UseOfMfc>false</UseOfMfc>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Oem/geos/src/algorithm/LineIntersector.cpp
===================================================================
--- trunk/MgDev/Oem/geos/src/algorithm/LineIntersector.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/geos/src/algorithm/LineIntersector.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -125,7 +125,7 @@
// <FIX>
// hack to ensure that non-endpoints always have a non-zero distance
if (dist == 0.0 && !(p==p0)) {
- dist=max(pdx,pdy);
+ dist=std::fmax(pdx,pdy);
}
}
assert(!(dist == 0.0 && !(p==p0))); // Bad distance calculation
Modified: trunk/MgDev/Oem/geos/src/geom/LineSegment.cpp
===================================================================
--- trunk/MgDev/Oem/geos/src/geom/LineSegment.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/geos/src/geom/LineSegment.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -168,10 +168,10 @@
int orient1 = algorithm::CGAlgorithms::orientationIndex(p0, p1, seg.p1);
// this handles the case where the points are L or collinear
if (orient0 >= 0 && orient1 >= 0)
- return max(orient0, orient1);
+ return std::fmax(orient0, orient1);
// this handles the case where the points are R or collinear
if (orient0 <= 0 && orient1 <= 0)
- return max(orient0, orient1);
+ return std::fmax(orient0, orient1);
// points lie on opposite sides ==> indeterminate orientation
return 0;
}
Modified: trunk/MgDev/Oem/geos/src/io/WKTWriter.cpp
===================================================================
--- trunk/MgDev/Oem/geos/src/io/WKTWriter.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/geos/src/io/WKTWriter.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -179,7 +179,7 @@
WKTWriter::appendGeometryTaggedText(const Geometry *geometry, int level,
Writer *writer)
{
- outputDimension = min( defaultOutputDimension,
+ outputDimension = std::fmin( defaultOutputDimension,
geometry->getCoordinateDimension() );
indent(level, writer);
Modified: trunk/MgDev/Oem/geos/src/operation/buffer/OffsetCurveSetBuilder.cpp
===================================================================
--- trunk/MgDev/Oem/geos/src/operation/buffer/OffsetCurveSetBuilder.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/geos/src/operation/buffer/OffsetCurveSetBuilder.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -333,7 +333,7 @@
return isTriangleErodedCompletely(ringCoord, bufferDistance);
const Envelope* env = ring->getEnvelopeInternal();
- double envMinDimension = std::min(env->getHeight(), env->getWidth());
+ double envMinDimension = std::fmin(env->getHeight(), env->getWidth());
if (bufferDistance < 0.0 && 2 * std::abs(bufferDistance) > envMinDimension)
return true;
Modified: trunk/MgDev/Oem/jsoncpp/src/lib_json/lib_json.vcxproj
===================================================================
--- trunk/MgDev/Oem/jsoncpp/src/lib_json/lib_json.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/jsoncpp/src/lib_json/lib_json.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -28,23 +28,23 @@
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
<WholeProgramOptimization>true</WholeProgramOptimization>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>MultiByte</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -96,7 +96,6 @@
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <DisableLanguageExtensions>true</DisableLanguageExtensions>
<ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>
@@ -112,6 +111,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -126,8 +126,6 @@
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <DisableLanguageExtensions>true</DisableLanguageExtensions>
- <ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>
</PrecompiledHeader>
@@ -143,6 +141,7 @@
</DataExecutionPrevention>
<TargetMachine>MachineX64</TargetMachine>
<GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -154,7 +153,6 @@
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <DisableLanguageExtensions>true</DisableLanguageExtensions>
<ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>
@@ -170,6 +168,7 @@
<DataExecutionPrevention>
</DataExecutionPrevention>
<GenerateDebugInformation>true</GenerateDebugInformation>
+ <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -184,7 +183,6 @@
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <DisableLanguageExtensions>true</DisableLanguageExtensions>
<ForceConformanceInForLoopScope>false</ForceConformanceInForLoopScope>
<RuntimeTypeInfo>true</RuntimeTypeInfo>
<PrecompiledHeader>
Modified: trunk/MgDev/Oem/oem.sln
===================================================================
--- trunk/MgDev/Oem/oem.sln 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Oem/oem.sln 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 14
+VisualStudioVersion = 14.0.22823.1
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ACE", "ACE\ACE_wrappers\ace\ACE.vcxproj", "{BD537C9A-FECA-1BAD-6757-8A6363336A1C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "db_dll", "dbxml\db-4.8.26\build_windows\db_dll.vcxproj", "{96C27024-6DEE-45ED-BCC3-A731949131FA}"
@@ -72,15 +74,15 @@
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "zlib", "gd\lpng\projects\vs\zlib.vcxproj", "{3CECB989-0B34-449D-9161-8BEE074D7EC0}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DWF Core Library", "DWFTK\develop\global\build\VC 11.0\DWFCore\DWFCore.vcxproj", "{8BECE007-1749-4300-87D8-267B613AAE6B}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DWF Core Library", "DWFTK\develop\global\build\VC 14.0\DWFCore\DWFCore.vcxproj", "{8BECE007-1749-4300-87D8-267B613AAE6B}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DWFToolkit", "DWFTK\develop\global\build\VC 11.0\DWFToolkit\DWFToolkit.vcxproj", "{2D22C637-6219-4096-8399-EEA4BBD142AA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DWFToolkit", "DWFTK\develop\global\build\VC 14.0\DWFToolkit\DWFToolkit.vcxproj", "{2D22C637-6219-4096-8399-EEA4BBD142AA}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DWF W2D (Whip) Toolkit", "DWFTK\develop\global\build\VC 11.0\WhipToolkit\WhipToolkit.vcxproj", "{681750CF-B191-4A41-B92C-0F94599B121D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DWF W2D (Whip) Toolkit", "DWFTK\develop\global\build\VC 14.0\WhipToolkit\WhipToolkit.vcxproj", "{681750CF-B191-4A41-B92C-0F94599B121D}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DWF XAML (Whip) Toolkit", "DWFTK\develop\global\build\VC 11.0\XAML\XAML.vcxproj", "{337A987F-97AE-46FF-98AF-6C6B9B81E3B2}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DWF XAML (Whip) Toolkit", "DWFTK\develop\global\build\VC 14.0\XAML\XAML.vcxproj", "{337A987F-97AE-46FF-98AF-6C6B9B81E3B2}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DWF W3D Toolkit", "DWFTK\develop\global\build\VC 11.0\W3DToolkit\W3DToolkit.vcxproj", "{9415DE9A-E01E-47C1-A159-EB1E1D4E518C}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DWF W3D Toolkit", "DWFTK\develop\global\build\VC 14.0\W3DToolkit\W3DToolkit.vcxproj", "{9415DE9A-E01E-47C1-A159-EB1E1D4E518C}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Modified: trunk/MgDev/Server/Server.sln
===================================================================
--- trunk/MgDev/Server/Server.sln 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/Server.sln 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 14
+VisualStudioVersion = 14.0.22823.1
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ServerCore", "src\Core\ServerCore.vcxproj", "{FDF553DE-0D30-4456-8A84-5009C9EAAED2}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "..\Common\Foundation\Foundation.vcxproj", "{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}"
Modified: trunk/MgDev/Server/src/Common/Base/ServerBase.vcxproj
===================================================================
--- trunk/MgDev/Server/src/Common/Base/ServerBase.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Common/Base/ServerBase.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Server/src/Common/Cache/ServerCache.vcxproj
===================================================================
--- trunk/MgDev/Server/src/Common/Cache/ServerCache.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Common/Cache/ServerCache.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Server/src/Common/Manager/ServerManager.vcxproj
===================================================================
--- trunk/MgDev/Server/src/Common/Manager/ServerManager.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Common/Manager/ServerManager.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Server/src/Common/Thread/ServerThread.vcxproj
===================================================================
--- trunk/MgDev/Server/src/Common/Thread/ServerThread.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Common/Thread/ServerThread.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Server/src/Core/ServerCore.vcxproj
===================================================================
--- trunk/MgDev/Server/src/Core/ServerCore.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Core/ServerCore.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -26,22 +26,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Server/src/Gws/GwsCommon/GwsCommon.vcxproj
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsCommon/GwsCommon.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Gws/GwsCommon/GwsCommon.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsBatchSortedBlockJoinQueryResults.cpp
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsBatchSortedBlockJoinQueryResults.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsBatchSortedBlockJoinQueryResults.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1592,7 +1592,7 @@
val = primaryCacheEntry->primaryKey->ToString();
}
- printf("%d) Key=%S Properties=%d\n", i+1, val, primaryCacheEntry->propertyCollection.size());
+ printf_s("%d) Key=%S Properties=%d\n", (int)i+1, val, (int)primaryCacheEntry->propertyCollection.size());
for(size_t j=0;j<primaryCacheEntry->propertyCollection.size();j++)
{
PropertyCacheEntry* propertyCacheEntry = primaryCacheEntry->propertyCollection[j];
Modified: trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsFdoCommand.cpp
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsFdoCommand.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsFdoCommand.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -820,7 +820,7 @@
GwsFailedStatus & failed
) const
{
- EGwsStatus stat = eGwsOk;
+ EGwsStatus stat1 = eGwsOk;
while (pReader != NULL && pReader->ReadNext()) {
char * str = NULL;
@@ -864,9 +864,9 @@
assert ("Fdo exception while getting lock conflicts");
e->Release (); // just silenly eat this
}
- stat = eGwsFdoLockConflict;
+ stat1 = eGwsFdoLockConflict;
delete str;
str = NULL;
}
- return stat;
+ return stat1;
}
Modified: trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsFeatureQueryDefinition.cpp
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsFeatureQueryDefinition.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsFeatureQueryDefinition.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -143,12 +143,12 @@
FdoXmlSaxHandler * GWSFeatureQueryDefinition::XmlStartElement(
FdoXmlSaxContext * ctx,
FdoString * uri,
- FdoString * name,
+ FdoString * elementname,
FdoString * qname,
FdoXmlAttributeCollection* attrs
)
{
- if (! _wcsicmp (name, GwsQueryXml::xmlGwsQualifiedClassName)) {
+ if (! _wcsicmp (elementname, GwsQueryXml::xmlGwsQualifiedClassName)) {
WSTR fsname;
WSTR schema;
WSTR classname;
@@ -172,14 +172,14 @@
} else {
throw FdoException::Create (L"Failed to parse xml");
}
- } else if (! _wcsicmp (name, GwsQueryXml::xmlGwsQuerySelectExpressionList)) {
+ } else if (! _wcsicmp (elementname, GwsQueryXml::xmlGwsQuerySelectExpressionList)) {
// Handle the select property list.
m_sellist = FdoIdentifierCollection::Create();
CGwsComputedIdentifierCollectionSaxHandler::GetHandler ()->SetDestination (m_sellist);
CGwsComputedIdentifierCollectionSaxHandler::GetHandler ()->SetXml (GwsQueryXml::xmlGwsQuerySelectExpression, GwsQueryXml::xmlGwsQuerySelectExpressionName);
return CGwsComputedIdentifierCollectionSaxHandler::GetHandler ();
- } else if (! _wcsicmp (name, GwsQueryXml::xmlGwsFilter)) {
+ } else if (! _wcsicmp (elementname, GwsQueryXml::xmlGwsFilter)) {
for (int i = 0; i < attrs->GetCount (); i ++) {
FdoPtr<FdoXmlAttribute> attr = attrs->GetItem (i);
@@ -193,5 +193,5 @@
}
}
- return CGwsObject::XmlStartElement (ctx, uri, name, qname, attrs);
+ return CGwsObject::XmlStartElement (ctx, uri, elementname, qname, attrs);
}
Modified: trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsJoinQueryDefinition.cpp
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsJoinQueryDefinition.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsJoinQueryDefinition.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -213,13 +213,13 @@
FdoXmlSaxHandler* GWSJoinQueryDefinition<T>::XmlStartElement (
FdoXmlSaxContext* ctx,
FdoString * uri,
- FdoString * name,
+ FdoString * elementname,
FdoString * qname,
FdoXmlAttributeCollection* attrs
)
{
CGwsObject * gwsobj = NULL;
- if (! _wcsicmp (name, GwsQueryXml::xmlGwsQuery)) {
+ if (! _wcsicmp (elementname, GwsQueryXml::xmlGwsQuery)) {
IGWSQueryDefinition * qrydef =
GwsQueryDefinitionXmlHelpers::ReadQueryDefinition (attrs);
if (qrydef != NULL) {
@@ -236,7 +236,7 @@
}
// left and right attributes reading are the same. Big deal
- } else if (! _wcsicmp (name, GwsQueryXml::xmlGwsLeftJoinAttributes)) {
+ } else if (! _wcsicmp (elementname, GwsQueryXml::xmlGwsLeftJoinAttributes)) {
for (int i = 0; i < attrs->GetCount (); i ++) {
FdoPtr<FdoXmlAttribute> attr = attrs->GetItem (i);
@@ -246,7 +246,7 @@
m_leftAttrs = FdoStringCollection::Create (value, L",");
}
}
- } else if (! _wcsicmp (name,GwsQueryXml::xmlGwsRightJoinAttributes)) {
+ } else if (! _wcsicmp (elementname,GwsQueryXml::xmlGwsRightJoinAttributes)) {
for (int i = 0; i < attrs->GetCount (); i ++) {
FdoPtr<FdoXmlAttribute> attr = attrs->GetItem (i);
@@ -258,7 +258,7 @@
}
}
- return CGwsObject::XmlStartElement (ctx, uri, name, qname, attrs);
+ return CGwsObject::XmlStartElement (ctx, uri, elementname, qname, attrs);
}
Modified: trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsMutableFeature.cpp
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsMutableFeature.cpp 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsMutableFeature.cpp 2015-09-21 04:22:58 UTC (rev 8760)
@@ -768,9 +768,9 @@
if(pValue == NULL)
throw FdoException::Create(PROPERTY_VALUE_NOT_SET);
const CGwsPropertyDesc & desc = GetPropertyDescriptor (propertyName);
- FdoPtr<FdoValueExpression> pVal = pValue->GetValue();
+ FdoPtr<FdoValueExpression> pVal1 = pValue->GetValue();
if (desc.m_ptype == FdoPropertyType_GeometricProperty) {
- FdoGeometryValue * pGeom = (FdoGeometryValue *) pVal.p;
+ FdoGeometryValue * pGeom = (FdoGeometryValue *) pVal1.p;
FdoPtr<FdoByteArray> pVal = pGeom->GetGeometry ();
*count = pVal->GetCount();
return pVal->GetData();
@@ -888,13 +888,13 @@
ValidatePropertyName(propertyName, & desc);
- FdoPtr<FdoPropertyValue> pPropertyValue =
+ FdoPtr<FdoPropertyValue> pPropertyValue1 =
m_pProperties->FindItem (propertyName);
- if (pPropertyValue == NULL) { // not yet set
+ if (pPropertyValue1 == NULL) { // not yet set
FdoPtr<FdoPropertyValue> pPropertyValue = ConstructPropertyValue (* desc);
m_pProperties->Add(pPropertyValue);
} else {
- FdoPtr<FdoValueExpression> pVal = pPropertyValue->GetValue ();
+ FdoPtr<FdoValueExpression> pVal = pPropertyValue1->GetValue ();
if (desc->m_ptype == FdoPropertyType_DataProperty) {
((FdoDataValue *) pVal.p)->SetNull ();
} else if (desc->m_ptype == FdoPropertyType_GeometricProperty) {
@@ -1152,7 +1152,7 @@
FdoPtr<FdoPropertyValue> pPropertyValue =
m_pProperties->FindItem (propertyName);
- FdoPtr<FdoGeometryValue> pGeometryValue;
+ FdoPtr<FdoGeometryValue> pGeometryValue1;
if (pPropertyValue == NULL) {
FdoPtr<FdoGeometryValue> pGeometryValue = FdoGeometryValue::Create(geom);
@@ -1160,8 +1160,8 @@
m_pProperties->Add(pPropertyValue);
} else {
- pGeometryValue = (FdoGeometryValue *) pPropertyValue->GetValue ();
- pGeometryValue->SetGeometry (geom);
+ pGeometryValue1 = (FdoGeometryValue *) pPropertyValue->GetValue ();
+ pGeometryValue1->SetGeometry (geom);
}
}
Modified: trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryEngine.vcxproj
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryEngine.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Gws/GwsQueryEngine/GwsQueryEngine.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
@@ -95,7 +95,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.\inc;..\Include;..\GwsCommon\inc;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;GWSQUERYENGINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;GWSQUERYENGINE_EXPORTS;_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -125,7 +125,7 @@
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>.\inc;..\Include;..\GwsCommon\inc;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;GWSQUERYENGINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;_WINDOWS;_DEBUG;_USRDLL;GWSQUERYENGINE_EXPORTS;_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
@@ -155,7 +155,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>.\inc;..\Include;..\GwsCommon\inc;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GWSQUERYENGINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GWSQUERYENGINE_EXPORTS;_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
@@ -188,7 +188,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<AdditionalIncludeDirectories>.\inc;..\Include;..\GwsCommon\inc;..\..\..\..\Oem\FDO\inc;..\..\..\..\Oem\FDO\inc\ExpressionEngine;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GWSQUERYENGINE_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;GWSQUERYENGINE_EXPORTS;_SILENCE_STDEXT_HASH_DEPRECATION_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling>
<ExceptionHandling>Async</ExceptionHandling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
Modified: trunk/MgDev/Server/src/Gws/GwsResource/GwsResource.vcxproj
===================================================================
--- trunk/MgDev/Server/src/Gws/GwsResource/GwsResource.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Gws/GwsResource/GwsResource.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Server/src/Gws/Include/GwsInclude.vcxproj
===================================================================
--- trunk/MgDev/Server/src/Gws/Include/GwsInclude.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Gws/Include/GwsInclude.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Server/src/PostBuild/PostBuild.vcxproj
===================================================================
--- trunk/MgDev/Server/src/PostBuild/PostBuild.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/PostBuild/PostBuild.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -26,19 +26,19 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Server/src/Services/Drawing/ServerDrawingService.vcxproj
===================================================================
--- trunk/MgDev/Server/src/Services/Drawing/ServerDrawingService.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Services/Drawing/ServerDrawingService.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.vcxproj
===================================================================
--- trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Services/Feature/ServerFeatureService.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Server/src/Services/Kml/ServerKmlService.vcxproj
===================================================================
--- trunk/MgDev/Server/src/Services/Kml/ServerKmlService.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Services/Kml/ServerKmlService.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.vcxproj
===================================================================
--- trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Services/Mapping/ServerMappingService.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Server/src/Services/Profiling/ServerProfilingService.vcxproj
===================================================================
--- trunk/MgDev/Server/src/Services/Profiling/ServerProfilingService.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Services/Profiling/ServerProfilingService.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.vcxproj
===================================================================
--- trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Services/Rendering/ServerRenderingService.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Server/src/Services/Resource/ServerResourceService.vcxproj
===================================================================
--- trunk/MgDev/Server/src/Services/Resource/ServerResourceService.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Services/Resource/ServerResourceService.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Server/src/Services/ServerAdmin/ServerAdminService.vcxproj
===================================================================
--- trunk/MgDev/Server/src/Services/ServerAdmin/ServerAdminService.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Services/ServerAdmin/ServerAdminService.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Server/src/Services/Site/ServerSiteService.vcxproj
===================================================================
--- trunk/MgDev/Server/src/Services/Site/ServerSiteService.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Services/Site/ServerSiteService.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Server/src/Services/Tile/ServerTileService.vcxproj
===================================================================
--- trunk/MgDev/Server/src/Services/Tile/ServerTileService.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/Services/Tile/ServerTileService.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Server/src/UnitTesting/UnitTesting.vcxproj
===================================================================
--- trunk/MgDev/Server/src/UnitTesting/UnitTesting.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Server/src/UnitTesting/UnitTesting.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.vcxproj
===================================================================
--- trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/ApacheAgent/ApacheAgent.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/CgiAgent/CgiAgent.vcxproj
===================================================================
--- trunk/MgDev/Web/src/CgiAgent/CgiAgent.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/CgiAgent/CgiAgent.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/DotNetApi/Foundation/FoundationDotNetApi.vcxproj
===================================================================
--- trunk/MgDev/Web/src/DotNetApi/Foundation/FoundationDotNetApi.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/DotNetApi/Foundation/FoundationDotNetApi.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -26,19 +26,19 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/DotNetApi/Geometry/GeometryDotNetApi.vcxproj
===================================================================
--- trunk/MgDev/Web/src/DotNetApi/Geometry/GeometryDotNetApi.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/DotNetApi/Geometry/GeometryDotNetApi.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -26,19 +26,19 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/DotNetApi/MapGuideCommon/MapGuideCommonDotNetApi.vcxproj
===================================================================
--- trunk/MgDev/Web/src/DotNetApi/MapGuideCommon/MapGuideCommonDotNetApi.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/DotNetApi/MapGuideCommon/MapGuideCommonDotNetApi.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -26,19 +26,19 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/DotNetApi/PlatformBase/PlatformBaseDotNetApi.vcxproj
===================================================================
--- trunk/MgDev/Web/src/DotNetApi/PlatformBase/PlatformBaseDotNetApi.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/DotNetApi/PlatformBase/PlatformBaseDotNetApi.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -26,19 +26,19 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/DotNetApi/Web/WebDotNetApi.vcxproj
===================================================================
--- trunk/MgDev/Web/src/DotNetApi/Web/WebDotNetApi.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/DotNetApi/Web/WebDotNetApi.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -26,19 +26,19 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcxproj
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/Foundation/FoundationApi.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcxproj
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/Geometry/GeometryApi.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcxproj
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/MapGuideCommon/MapGuideCommonApi.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcxproj
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/PlatformBase/PlatformBaseApi.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApi.vcxproj
===================================================================
--- trunk/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApi.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/DotNetUnmanagedApi/Web/WebApi.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/HttpHandler/HttpHandler.vcxproj
===================================================================
--- trunk/MgDev/Web/src/HttpHandler/HttpHandler.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/HttpHandler/HttpHandler.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/IsapiAgent/IsapiAgent.vcxproj
===================================================================
--- trunk/MgDev/Web/src/IsapiAgent/IsapiAgent.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/IsapiAgent/IsapiAgent.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/JavaApi/JavaApi.vcxproj
===================================================================
--- trunk/MgDev/Web/src/JavaApi/JavaApi.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/JavaApi/JavaApi.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj
===================================================================
--- trunk/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/JavaApiEx/JavaApiEx.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/MapAgentCommon/MapAgentCommon.vcxproj
===================================================================
--- trunk/MgDev/Web/src/MapAgentCommon/MapAgentCommon.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/MapAgentCommon/MapAgentCommon.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>StaticLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/MapGuideApi/MapGuideApi.vcxproj
===================================================================
--- trunk/MgDev/Web/src/MapGuideApi/MapGuideApi.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/MapGuideApi/MapGuideApi.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -26,19 +26,19 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Utility</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/PhpApi/PhpApi.vcxproj
===================================================================
--- trunk/MgDev/Web/src/PhpApi/PhpApi.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/PhpApi/PhpApi.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/PhpMapGuideApiEnvConfig/PhpMapGuideApiEnvConfig.vcxproj
===================================================================
--- trunk/MgDev/Web/src/PhpMapGuideApiEnvConfig/PhpMapGuideApiEnvConfig.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/PhpMapGuideApiEnvConfig/PhpMapGuideApiEnvConfig.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/PostBuild/PostBuild.vcxproj
===================================================================
--- trunk/MgDev/Web/src/PostBuild/PostBuild.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/PostBuild/PostBuild.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -26,19 +26,19 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Makefile</ConfigurationType>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/WebApp/WebApp.vcxproj
===================================================================
--- trunk/MgDev/Web/src/WebApp/WebApp.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/WebApp/WebApp.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/WebSupport/WebSupport.vcxproj
===================================================================
--- trunk/MgDev/Web/src/WebSupport/WebSupport.vcxproj 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/WebSupport/WebSupport.vcxproj 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -27,22 +27,22 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
<CharacterSet>Unicode</CharacterSet>
- <PlatformToolset>v110</PlatformToolset>
+ <PlatformToolset>v140</PlatformToolset>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<ImportGroup Label="ExtensionSettings">
Modified: trunk/MgDev/Web/src/WebTier.sln
===================================================================
--- trunk/MgDev/Web/src/WebTier.sln 2015-09-10 17:10:59 UTC (rev 8759)
+++ trunk/MgDev/Web/src/WebTier.sln 2015-09-21 04:22:58 UTC (rev 8760)
@@ -1,5 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 14
+VisualStudioVersion = 14.0.22823.1
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CgiAgent", "CgiAgent\CgiAgent.vcxproj", "{DA3459C2-1430-499F-996F-218DA3DD755D}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "..\..\Common\Foundation\Foundation.vcxproj", "{A82ADC7D-4DA4-42F2-9BF6-DF5DCFB44425}"
More information about the mapguide-commits
mailing list