summary refs log tree commit diff stats
path: root/src/common
diff options
context:
space:
mode:
authorArnavion <arnavion@gmail.com>2013-04-25 21:03:03 -0700
committerArnavion <arnavion@gmail.com>2013-04-25 21:03:03 -0700
commit07bc467d031cbaa47331a7fec52b6bc02ab38f95 (patch)
treea17087c925fb7f0422b2df5b537c8e42ade24a93 /src/common
parenta39f8ea71f3c34b60949421e3385e7ed980411b8 (diff)
win32: Moved PlatformToolset configuration to individual project files. It should be set before setting other properties or importing other props.
This fixes the broken GUI Platform Toolset indicator, as well as VS compilation itself if another version such as 2010 was also installed.
Diffstat (limited to 'src/common')
-rw-r--r--src/common/common.vcxproj3
-rw-r--r--src/common/make-te.vcxproj3
2 files changed, 6 insertions, 0 deletions
diff --git a/src/common/common.vcxproj b/src/common/common.vcxproj
index 615f430d..c71d6ced 100644
--- a/src/common/common.vcxproj
+++ b/src/common/common.vcxproj
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup Label="Configuration">

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

   <ItemGroup Label="ProjectConfigurations">

     <ProjectConfiguration Include="Release|Win32">

       <Configuration>Release</Configuration>

diff --git a/src/common/make-te.vcxproj b/src/common/make-te.vcxproj
index 431916f3..07bb5ca4 100644
--- a/src/common/make-te.vcxproj
+++ b/src/common/make-te.vcxproj
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>

 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

+  <PropertyGroup Label="Configuration">

+    <PlatformToolset>v110</PlatformToolset>

+  </PropertyGroup>

   <ItemGroup Label="ProjectConfigurations">

     <ProjectConfiguration Include="Release|Win32">

       <Configuration>Release</Configuration>