Skip to content
This repository
Browse code

Use conditional elements to support VS2010.

  • Loading branch information...
commit 67a024e0a3a2866ee7100bcc3d1b8a47cc65be63 1 parent f1eb60f
Marcin Wisnicki mwisnicki authored
9 CefSharp.WinForms/CefSharp.WinForms.vcxproj
@@ -16,16 +16,15 @@
16 16 <Keyword>ManagedCProj</Keyword>
17 17 </PropertyGroup>
18 18 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  19 + <Import Project="$(SolutionDir)\CefSharp.props" />
19 20 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
20 21 <ConfigurationType>DynamicLibrary</ConfigurationType>
21   - <PlatformToolset>v110</PlatformToolset>
22 22 <CharacterSet>Unicode</CharacterSet>
23 23 <CLRSupport>true</CLRSupport>
24 24 <WholeProgramOptimization>true</WholeProgramOptimization>
25 25 </PropertyGroup>
26 26 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
27 27 <ConfigurationType>DynamicLibrary</ConfigurationType>
28   - <PlatformToolset>v110</PlatformToolset>
29 28 <CharacterSet>Unicode</CharacterSet>
30 29 <CLRSupport>true</CLRSupport>
31 30 </PropertyGroup>
@@ -73,7 +72,7 @@
73 72 <Link>
74 73 <AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib;CefSharp.lib;%(AdditionalDependencies)</AdditionalDependencies>
75 74 <ShowProgress>LinkVerbose</ShowProgress>
76   - <AdditionalLibraryDirectories>$(SolutionDir)libs\$(Configuration);$(SolutionDir)libs\$(Configuration)\VS2012;$(SolutionDir)CefSharp\bin\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  75 + <AdditionalLibraryDirectories>$(SolutionDir)libs\$(Configuration);$(SolutionDir)libs\$(Configuration)\VS$(VisualStudioProductVersion);$(SolutionDir)CefSharp\bin\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
77 76 <GenerateDebugInformation>true</GenerateDebugInformation>
78 77 <AssemblyDebug>true</AssemblyDebug>
79 78 <TargetMachine>MachineX86</TargetMachine>
@@ -91,7 +90,7 @@
91 90 <Link>
92 91 <AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib;CefSharp.lib;%(AdditionalDependencies)</AdditionalDependencies>
93 92 <ShowProgress>LinkVerbose</ShowProgress>
94   - <AdditionalLibraryDirectories>$(SolutionDir)libs\$(Configuration);$(SolutionDir)libs\$(Configuration)\VS2012;$(SolutionDir)CefSharp\bin\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  93 + <AdditionalLibraryDirectories>$(SolutionDir)libs\$(Configuration);$(SolutionDir)libs\$(Configuration)\VS$(VisualStudioProductVersion);$(SolutionDir)CefSharp\bin\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
95 94 <GenerateDebugInformation>false</GenerateDebugInformation>
96 95 <TargetMachine>MachineX86</TargetMachine>
97 96 </Link>
@@ -123,4 +122,4 @@
123 122 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
124 123 <ImportGroup Label="ExtensionTargets">
125 124 </ImportGroup>
126   -</Project>
  125 +</Project>
9 CefSharp.Wpf/CefSharp.Wpf.vcxproj
@@ -16,16 +16,15 @@
16 16 <Keyword>ManagedCProj</Keyword>
17 17 </PropertyGroup>
18 18 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  19 + <Import Project="$(SolutionDir)\CefSharp.props" />
19 20 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
20 21 <ConfigurationType>DynamicLibrary</ConfigurationType>
21   - <PlatformToolset>v110</PlatformToolset>
22 22 <CharacterSet>Unicode</CharacterSet>
23 23 <CLRSupport>true</CLRSupport>
24 24 <WholeProgramOptimization>true</WholeProgramOptimization>
25 25 </PropertyGroup>
26 26 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
27 27 <ConfigurationType>DynamicLibrary</ConfigurationType>
28   - <PlatformToolset>v110</PlatformToolset>
29 28 <CharacterSet>Unicode</CharacterSet>
30 29 <CLRSupport>true</CLRSupport>
31 30 </PropertyGroup>
@@ -73,7 +72,7 @@
73 72 <Link>
74 73 <AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib;CefSharp.lib;%(AdditionalDependencies)</AdditionalDependencies>
75 74 <ShowProgress>LinkVerbose</ShowProgress>
76   - <AdditionalLibraryDirectories>$(SolutionDir)libs\$(Configuration);$(SolutionDir)libs\$(Configuration)\VS2012;$(SolutionDir)CefSharp\bin\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  75 + <AdditionalLibraryDirectories>$(SolutionDir)libs\$(Configuration);$(SolutionDir)libs\$(Configuration)\VS$(VisualStudioProductVersion);$(SolutionDir)CefSharp\bin\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
77 76 <GenerateDebugInformation>true</GenerateDebugInformation>
78 77 <AssemblyDebug>true</AssemblyDebug>
79 78 <TargetMachine>MachineX86</TargetMachine>
@@ -91,7 +90,7 @@
91 90 <Link>
92 91 <AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib;CefSharp.lib;%(AdditionalDependencies)</AdditionalDependencies>
93 92 <ShowProgress>LinkVerbose</ShowProgress>
94   - <AdditionalLibraryDirectories>$(SolutionDir)libs\$(Configuration);$(SolutionDir)libs\$(Configuration)\VS2012;$(SolutionDir)CefSharp\bin\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  93 + <AdditionalLibraryDirectories>$(SolutionDir)libs\$(Configuration);$(SolutionDir)libs\$(Configuration)\VS$(VisualStudioProductVersion);$(SolutionDir)CefSharp\bin\$(Configuration);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
95 94 <GenerateDebugInformation>false</GenerateDebugInformation>
96 95 <TargetMachine>MachineX86</TargetMachine>
97 96 </Link>
@@ -131,4 +130,4 @@
131 130 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
132 131 <ImportGroup Label="ExtensionTargets">
133 132 </ImportGroup>
134   -</Project>
  133 +</Project>
12 CefSharp.props
... ... @@ -0,0 +1,12 @@
  1 +<?xml version="1.0" encoding="utf-8"?>
  2 +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  3 +
  4 + <PropertyGroup>
  5 + <VisualStudioProductVersion>2010</VisualStudioProductVersion>
  6 + <VisualStudioProductVersion Condition="'$(VisualStudioVersion)'=='11.0'">2012</VisualStudioProductVersion>
  7 +
  8 + <PlatformToolset>v100</PlatformToolset>
  9 + <PlatformToolset Condition="'$(VisualStudioVersion)'=='11.0'">v110</PlatformToolset>
  10 + </PropertyGroup>
  11 +
  12 +</Project>
5 CefSharp.sln
@@ -19,6 +19,11 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CefSharp.Wpf.Test", "CefSha
19 19 EndProject
20 20 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CefSharp.WinForms.Test", "CefSharp.WinForms.Test\CefSharp.WinForms.Test.csproj", "{310B527B-A811-450D-A1B2-79352FDB338A}"
21 21 EndProject
  22 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{47D0DC8C-D707-4D8A-A578-7737AA9CE79B}"
  23 + ProjectSection(SolutionItems) = preProject
  24 + CefSharp.props = CefSharp.props
  25 + EndProjectSection
  26 +EndProject
22 27 Global
23 28 GlobalSection(SolutionConfigurationPlatforms) = preSolution
24 29 Debug|Any CPU = Debug|Any CPU
9 CefSharp/CefSharp.vcxproj
@@ -16,16 +16,15 @@
16 16 <Keyword>ManagedCProj</Keyword>
17 17 </PropertyGroup>
18 18 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  19 + <Import Project="$(SolutionDir)\CefSharp.props" />
19 20 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
20 21 <ConfigurationType>DynamicLibrary</ConfigurationType>
21   - <PlatformToolset>v110</PlatformToolset>
22 22 <CharacterSet>Unicode</CharacterSet>
23 23 <CLRSupport>true</CLRSupport>
24 24 <WholeProgramOptimization>true</WholeProgramOptimization>
25 25 </PropertyGroup>
26 26 <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
27 27 <ConfigurationType>DynamicLibrary</ConfigurationType>
28   - <PlatformToolset>v110</PlatformToolset>
29 28 <CharacterSet>Unicode</CharacterSet>
30 29 <CLRSupport>true</CLRSupport>
31 30 </PropertyGroup>
@@ -79,7 +78,7 @@
79 78 <Link>
80 79 <AdditionalDependencies>opengl32.lib;glu32.lib;libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies)</AdditionalDependencies>
81 80 <ShowProgress>LinkVerbose</ShowProgress>
82   - <AdditionalLibraryDirectories>$(SolutionDir)libs\$(Configuration)\;$(SolutionDir)libs\$(Configuration)\VS2012;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  81 + <AdditionalLibraryDirectories>$(SolutionDir)libs\$(Configuration)\;$(SolutionDir)libs\$(Configuration)\VS$(VisualStudioProductVersion);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
83 82 <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
84 83 <GenerateDebugInformation>true</GenerateDebugInformation>
85 84 <AssemblyDebug>true</AssemblyDebug>
@@ -98,7 +97,7 @@
98 97 <Link>
99 98 <AdditionalDependencies>opengl32.lib;glu32.lib;libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies)</AdditionalDependencies>
100 99 <ShowProgress>LinkVerbose</ShowProgress>
101   - <AdditionalLibraryDirectories>$(SolutionDir)libs\$(Configuration)\;$(SolutionDir)libs\$(Configuration)\VS2012;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
  100 + <AdditionalLibraryDirectories>$(SolutionDir)libs\$(Configuration)\;$(SolutionDir)libs\$(Configuration)\VS$(VisualStudioProductVersion);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
102 101 <GenerateDebugInformation>false</GenerateDebugInformation>
103 102 <TargetMachine>MachineX86</TargetMachine>
104 103 </Link>
@@ -170,4 +169,4 @@
170 169 <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
171 170 <ImportGroup Label="ExtensionTargets">
172 171 </ImportGroup>
173   -</Project>
  172 +</Project>

0 comments on commit 67a024e

Please sign in to comment.
Something went wrong with that request. Please try again.