Skip to content

Commit 3f9bbb4

Browse files
amaitlandamaitland
committed
Merge branch 'JsBinding/Wip2' into JsBinding_WIP
2 parents 92c41d2 + 14971f6 commit 3f9bbb4

File tree

5 files changed

+78
-5
lines changed

5 files changed

+78
-5
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ bin/
2323
obj/
2424
packages/
2525
Debug/
26+
Release/
2627
CefSharp/app.aps
2728
debug.log
2829
CefSharp.BrowserSubprocess/Release

‎CefSharp.BrowserSubprocess.Core/CefSharp.BrowserSubprocess.Core.vcxproj‎

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,18 @@
66
<Configuration>Debug</Configuration>
77
<Platform>Win32</Platform>
88
</ProjectConfiguration>
9+
<ProjectConfiguration Include="Debug|x64">
10+
<Configuration>Debug</Configuration>
11+
<Platform>x64</Platform>
12+
</ProjectConfiguration>
913
<ProjectConfiguration Include="Release|Win32">
1014
<Configuration>Release</Configuration>
1115
<Platform>Win32</Platform>
1216
</ProjectConfiguration>
17+
<ProjectConfiguration Include="Release|x64">
18+
<Configuration>Release</Configuration>
19+
<Platform>x64</Platform>
20+
</ProjectConfiguration>
1321
</ItemGroup>
1422
<PropertyGroup Label="Globals">
1523
<ProjectGuid>{6C4BB501-2F8E-48AC-9AB5-8CFB2D74185C}</ProjectGuid>
@@ -24,31 +32,58 @@
2432
<CLRSupport>true</CLRSupport>
2533
<CharacterSet>Unicode</CharacterSet>
2634
</PropertyGroup>
35+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
36+
<ConfigurationType>DynamicLibrary</ConfigurationType>
37+
<UseDebugLibraries>true</UseDebugLibraries>
38+
<CLRSupport>true</CLRSupport>
39+
<CharacterSet>Unicode</CharacterSet>
40+
</PropertyGroup>
2741
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
2842
<ConfigurationType>DynamicLibrary</ConfigurationType>
2943
<UseDebugLibraries>false</UseDebugLibraries>
3044
<CLRSupport>true</CLRSupport>
3145
<CharacterSet>Unicode</CharacterSet>
3246
</PropertyGroup>
47+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
48+
<ConfigurationType>DynamicLibrary</ConfigurationType>
49+
<UseDebugLibraries>false</UseDebugLibraries>
50+
<CLRSupport>true</CLRSupport>
51+
<CharacterSet>Unicode</CharacterSet>
52+
</PropertyGroup>
3353
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
3454
<ImportGroup Label="ExtensionSettings">
3555
</ImportGroup>
3656
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
3757
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
3858
</ImportGroup>
59+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
60+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
61+
</ImportGroup>
3962
<ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
4063
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
4164
</ImportGroup>
65+
<ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
66+
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
67+
</ImportGroup>
4268
<PropertyGroup Label="UserMacros" />
4369
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
4470
<LinkIncremental>true</LinkIncremental>
4571
<LinkKeyFile>..\CefSharp.snk</LinkKeyFile>
4672
<IgnoreImportLibrary>true</IgnoreImportLibrary>
4773
</PropertyGroup>
74+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
75+
<LinkIncremental>true</LinkIncremental>
76+
<LinkKeyFile>..\CefSharp.snk</LinkKeyFile>
77+
<IgnoreImportLibrary>true</IgnoreImportLibrary>
78+
</PropertyGroup>
4879
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
4980
<LinkIncremental>false</LinkIncremental>
5081
<LinkKeyFile>..\CefSharp.snk</LinkKeyFile>
5182
</PropertyGroup>
83+
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
84+
<LinkIncremental>false</LinkIncremental>
85+
<LinkKeyFile>..\CefSharp.snk</LinkKeyFile>
86+
</PropertyGroup>
5287
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
5388
<ClCompile>
5489
<WarningLevel>Level3</WarningLevel>
@@ -64,6 +99,21 @@
6499
<AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
65100
</Link>
66101
</ItemDefinitionGroup>
102+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
103+
<ClCompile>
104+
<WarningLevel>Level3</WarningLevel>
105+
<AdditionalIncludeDirectories>$(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)</AdditionalIncludeDirectories>
106+
<Optimization>Disabled</Optimization>
107+
<PreprocessorDefinitions>WIN32;_DEBUG;EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
108+
<PrecompiledHeader>Use</PrecompiledHeader>
109+
</ClCompile>
110+
<Link>
111+
<GenerateDebugInformation>true</GenerateDebugInformation>
112+
<AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib</AdditionalDependencies>
113+
<AdditionalLibraryDirectories>$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion);$(SolutionDir)CefSharp.Core\bin</AdditionalLibraryDirectories>
114+
<AdditionalOptions>/ignore:4099 %(AdditionalOptions)</AdditionalOptions>
115+
</Link>
116+
</ItemDefinitionGroup>
67117
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
68118
<ClCompile>
69119
<WarningLevel>Level3</WarningLevel>
@@ -77,6 +127,19 @@
77127
<AdditionalLibraryDirectories>$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion)</AdditionalLibraryDirectories>
78128
</Link>
79129
</ItemDefinitionGroup>
130+
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
131+
<ClCompile>
132+
<WarningLevel>Level3</WarningLevel>
133+
<AdditionalIncludeDirectories>$(SolutionDir)packages\$(CefSdkVer)\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)</AdditionalIncludeDirectories>
134+
<PreprocessorDefinitions>WIN32;NDEBUG;EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
135+
<PrecompiledHeader>Use</PrecompiledHeader>
136+
</ClCompile>
137+
<Link>
138+
<GenerateDebugInformation>true</GenerateDebugInformation>
139+
<AdditionalDependencies>libcef.lib;libcef_dll_wrapper.lib</AdditionalDependencies>
140+
<AdditionalLibraryDirectories>$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\$(CefSdkVer)\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion)</AdditionalLibraryDirectories>
141+
</Link>
142+
</ItemDefinitionGroup>
80143
<ItemGroup>
81144
<Reference Include="System" />
82145
<Reference Include="System.Core" />
@@ -113,7 +176,9 @@
113176
<ClCompile Include="JavascriptPropertyWrapper.cpp" />
114177
<ClCompile Include="Stdafx.cpp">
115178
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
179+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
116180
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
181+
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
117182
</ClCompile>
118183
<ClCompile Include="TypeUtils.cpp" />
119184
</ItemGroup>

‎CefSharp.Example/CefExample.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ public static void Init()
1616
settings.RemoteDebuggingPort = 8088;
1717
//settings.CefCommandLineArgs.Add("renderer-process-limit", "1");
1818
//settings.CefCommandLineArgs.Add("renderer-startup-dialog", "renderer-startup-dialog");
19-
2019

2120
if (debuggingSubProcess)
2221
{
23-
settings.BrowserSubprocessPath = "..\\..\\..\\..\\CefSharp.BrowserSubprocess\\bin\\x86\\Debug\\CefSharp.BrowserSubprocess.exe";
22+
var architecture = Environment.Is64BitProcess ? "x64" : "x86";
23+
settings.BrowserSubprocessPath = "..\\..\\..\\..\\CefSharp.BrowserSubprocess\\bin\\" + architecture + "\\Debug\\CefSharp.BrowserSubprocess.exe";
2424
}
2525

2626
settings.RegisterScheme(new CefCustomScheme

‎CefSharp/IWebBrowser.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,11 @@ public interface IWebBrowser : IDisposable
137137
/// binding.</remarks>
138138
double ZoomLevel { get; set; }
139139

140+
/// <summary>
141+
/// Url which can be loaded in a browser control to view the dev tools
142+
/// </summary>
143+
string DevToolsUrl { get; }
144+
140145
/// <summary>
141146
/// Search for text within the current page.
142147
/// </summary>

‎CefSharp3.sln‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.30110.0
4+
VisualStudioVersion = 12.0.30723.0
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CefSharp.Test", "CefSharp.Test\CefSharp.Test.csproj", "{7A4D5447-183B-4A11-8E63-9848991B46FF}"
77
EndProject
@@ -177,12 +177,14 @@ Global
177177
{6C4BB501-2F8E-48AC-9AB5-8CFB2D74185C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
178178
{6C4BB501-2F8E-48AC-9AB5-8CFB2D74185C}.Debug|Win32.ActiveCfg = Debug|Win32
179179
{6C4BB501-2F8E-48AC-9AB5-8CFB2D74185C}.Debug|Win32.Build.0 = Debug|Win32
180-
{6C4BB501-2F8E-48AC-9AB5-8CFB2D74185C}.Debug|x64.ActiveCfg = Debug|Win32
180+
{6C4BB501-2F8E-48AC-9AB5-8CFB2D74185C}.Debug|x64.ActiveCfg = Debug|x64
181+
{6C4BB501-2F8E-48AC-9AB5-8CFB2D74185C}.Debug|x64.Build.0 = Debug|x64
181182
{6C4BB501-2F8E-48AC-9AB5-8CFB2D74185C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
182183
{6C4BB501-2F8E-48AC-9AB5-8CFB2D74185C}.Release|Mixed Platforms.Build.0 = Release|Win32
183184
{6C4BB501-2F8E-48AC-9AB5-8CFB2D74185C}.Release|Win32.ActiveCfg = Release|Win32
184185
{6C4BB501-2F8E-48AC-9AB5-8CFB2D74185C}.Release|Win32.Build.0 = Release|Win32
185-
{6C4BB501-2F8E-48AC-9AB5-8CFB2D74185C}.Release|x64.ActiveCfg = Release|Win32
186+
{6C4BB501-2F8E-48AC-9AB5-8CFB2D74185C}.Release|x64.ActiveCfg = Release|x64
187+
{6C4BB501-2F8E-48AC-9AB5-8CFB2D74185C}.Release|x64.Build.0 = Release|x64
186188
EndGlobalSection
187189
GlobalSection(SolutionProperties) = preSolution
188190
HideSolutionNode = FALSE

0 commit comments

Comments
 (0)