# HG changeset patch # User Olaf Wintermann # Date 1484489287 -3600 # Node ID a24465cc726221b7681fe1fbc4a9ba1039963351 # Parent 774b741984a28a31d7d535ad4ad3d5ddf458f8ce fixes VS settings diff -r 774b741984a2 -r a24465cc7262 ui/wpf/UIwrapper/UIwrapper.sln --- a/ui/wpf/UIwrapper/UIwrapper.sln Sun Sep 18 08:39:37 2016 +0200 +++ b/ui/wpf/UIwrapper/UIwrapper.sln Sun Jan 15 15:08:07 2017 +0100 @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2013 for Windows Desktop -VisualStudioVersion = 12.0.31101.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.25420.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UIwrapper", "UIwrapper\UIwrapper.vcxproj", "{367C474F-D7EA-44E3-9CB7-A4A35DCE9CC5}" ProjectSection(ProjectDependencies) = postProject @@ -13,41 +13,24 @@ Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - Debug|Mixed Platforms = Debug|Mixed Platforms - Debug|Win32 = Debug|Win32 Debug|x64 = Debug|x64 Release|Any CPU = Release|Any CPU - Release|Mixed Platforms = Release|Mixed Platforms - Release|Win32 = Release|Win32 Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {367C474F-D7EA-44E3-9CB7-A4A35DCE9CC5}.Debug|Any CPU.ActiveCfg = Debug|Win32 - {367C474F-D7EA-44E3-9CB7-A4A35DCE9CC5}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32 - {367C474F-D7EA-44E3-9CB7-A4A35DCE9CC5}.Debug|Mixed Platforms.Build.0 = Debug|Win32 - {367C474F-D7EA-44E3-9CB7-A4A35DCE9CC5}.Debug|Win32.ActiveCfg = Debug|Win32 - {367C474F-D7EA-44E3-9CB7-A4A35DCE9CC5}.Debug|Win32.Build.0 = Debug|Win32 + {367C474F-D7EA-44E3-9CB7-A4A35DCE9CC5}.Debug|Any CPU.ActiveCfg = Debug|x64 + {367C474F-D7EA-44E3-9CB7-A4A35DCE9CC5}.Debug|Any CPU.Build.0 = Debug|x64 {367C474F-D7EA-44E3-9CB7-A4A35DCE9CC5}.Debug|x64.ActiveCfg = Debug|x64 {367C474F-D7EA-44E3-9CB7-A4A35DCE9CC5}.Debug|x64.Build.0 = Debug|x64 {367C474F-D7EA-44E3-9CB7-A4A35DCE9CC5}.Release|Any CPU.ActiveCfg = Release|Win32 - {367C474F-D7EA-44E3-9CB7-A4A35DCE9CC5}.Release|Mixed Platforms.ActiveCfg = Release|Win32 - {367C474F-D7EA-44E3-9CB7-A4A35DCE9CC5}.Release|Mixed Platforms.Build.0 = Release|Win32 - {367C474F-D7EA-44E3-9CB7-A4A35DCE9CC5}.Release|Win32.ActiveCfg = Release|Win32 - {367C474F-D7EA-44E3-9CB7-A4A35DCE9CC5}.Release|Win32.Build.0 = Release|Win32 {367C474F-D7EA-44E3-9CB7-A4A35DCE9CC5}.Release|x64.ActiveCfg = Release|x64 {367C474F-D7EA-44E3-9CB7-A4A35DCE9CC5}.Release|x64.Build.0 = Release|x64 {8573F7D8-F05F-4195-9005-1C219B976146}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8573F7D8-F05F-4195-9005-1C219B976146}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8573F7D8-F05F-4195-9005-1C219B976146}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU - {8573F7D8-F05F-4195-9005-1C219B976146}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU - {8573F7D8-F05F-4195-9005-1C219B976146}.Debug|Win32.ActiveCfg = Debug|Any CPU {8573F7D8-F05F-4195-9005-1C219B976146}.Debug|x64.ActiveCfg = Debug|Any CPU {8573F7D8-F05F-4195-9005-1C219B976146}.Debug|x64.Build.0 = Debug|Any CPU {8573F7D8-F05F-4195-9005-1C219B976146}.Release|Any CPU.ActiveCfg = Release|Any CPU {8573F7D8-F05F-4195-9005-1C219B976146}.Release|Any CPU.Build.0 = Release|Any CPU - {8573F7D8-F05F-4195-9005-1C219B976146}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU - {8573F7D8-F05F-4195-9005-1C219B976146}.Release|Mixed Platforms.Build.0 = Release|Any CPU - {8573F7D8-F05F-4195-9005-1C219B976146}.Release|Win32.ActiveCfg = Release|Any CPU {8573F7D8-F05F-4195-9005-1C219B976146}.Release|x64.ActiveCfg = Release|Any CPU {8573F7D8-F05F-4195-9005-1C219B976146}.Release|x64.Build.0 = Release|Any CPU EndGlobalSection diff -r 774b741984a2 -r a24465cc7262 ui/wpf/UIwrapper/UIwrapper/UIwrapper.vcxproj --- a/ui/wpf/UIwrapper/UIwrapper/UIwrapper.vcxproj Sun Sep 18 08:39:37 2016 +0200 +++ b/ui/wpf/UIwrapper/UIwrapper/UIwrapper.vcxproj Sun Jan 15 15:08:07 2017 +0100 @@ -84,6 +84,7 @@ false $(SolutionDir)..\..\..\build\UIwrapper\ $(SolutionDir)..\..\..\build\UIwrapper\$(Configuration)\ + $(LibraryPath) @@ -91,6 +92,7 @@ Disabled WIN32;_DEBUG;%(PreprocessorDefinitions) Use + $(SolutionDir)..\..\..\build\UIcore\;%(AdditionalUsingDirectories) true