Skip to content

Commit

Permalink
turns out previous commit need x64
Browse files Browse the repository at this point in the history
- so bump `cef.sdk` in a non-DRY manner
- I also threw in a small .gitignore OCD change
  • Loading branch information
jornh committed Mar 27, 2014
1 parent 7e7b4ad commit edb65a7
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
8 changes: 4 additions & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,16 @@
*.xml
_ReSharper*

obj/
bin/
obj/
packages/
Debug/
!/CEF/Win32/Debug
packages
!/CEF/x64/Debug
CefSharp/app.aps
debug.log
CefSharp.BrowserSubprocess/Release
CefSharp.BrowserSubprocess/x64/Release
CefSharp.Core/Win32/Release
CefSharp.Core/x64/Release
CefSharp/Win32/Release
CefSharp/x64/Release
CefSharp.BrowserSubprocess.lib
Expand Down
2 changes: 1 addition & 1 deletion .nuget/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="cef.redist" version="3.1650.1562-pre0" />
<package id="cef.sdk" version="3.1650.1562-pre0" />
<package id="cef.sdk" version="3.1650.1562-pre1" />
</packages>
16 changes: 8 additions & 8 deletions CefSharp.Core/CefSharp.Core.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)packages\cef.sdk.3.1650.1562-pre0\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)packages\cef.sdk.3.1650.1562-pre1\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;USING_CEF_SHARED;_CRT_SECURE_NO_WARNINGS;EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
Expand All @@ -122,7 +122,7 @@
<Link>
<AdditionalDependencies>opengl32.lib;glu32.lib;libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>LinkVerbose</ShowProgress>
<AdditionalLibraryDirectories>$(SolutionDir)packages\cef.sdk.3.1650.1562-pre0\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\cef.sdk.3.1650.1562-pre0\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)packages\cef.sdk.3.1650.1562-pre1\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\cef.sdk.3.1650.1562-pre1\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
Expand All @@ -135,7 +135,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)packages\cef.sdk.3.1650.1562-pre0\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)packages\cef.sdk.3.1650.1562-pre1\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_DEBUG;_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;USING_CEF_SHARED;_CRT_SECURE_NO_WARNINGS;EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
Expand All @@ -150,7 +150,7 @@
<Link>
<AdditionalDependencies>opengl32.lib;glu32.lib;libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>LinkVerbose</ShowProgress>
<AdditionalLibraryDirectories>$(SolutionDir)packages\cef.sdk.3.1650.1562-pre0\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\cef.sdk.3.1650.1562-pre0\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)packages\cef.sdk.3.1650.1562-pre1\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\cef.sdk.3.1650.1562-pre1\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AssemblyDebug>true</AssemblyDebug>
Expand All @@ -161,7 +161,7 @@
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)packages\cef.sdk.3.1650.1562-pre0\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)packages\cef.sdk.3.1650.1562-pre1\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_NDEBUG;_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;USING_CEF_SHARED;_CRT_SECURE_NO_WARNINGS;EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
Expand All @@ -172,15 +172,15 @@
<Link>
<AdditionalDependencies>opengl32.lib;glu32.lib;libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>LinkVerbose</ShowProgress>
<AdditionalLibraryDirectories>$(SolutionDir)packages\cef.sdk.3.1650.1562-pre0\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\cef.sdk.3.1650.1562-pre0\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)packages\cef.sdk.3.1650.1562-pre1\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\cef.sdk.3.1650.1562-pre1\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
<TargetMachine>MachineX86</TargetMachine>
<KeyFile>$(LinkKeyFile)</KeyFile>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>$(SolutionDir)packages\cef.sdk.3.1650.1562-pre0\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)packages\cef.sdk.3.1650.1562-pre1\CEF;%(AdditionalIncludeDirectories);$(ProjectDir)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>_NDEBUG;_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;WIN32_LEAN_AND_MEAN;USING_CEF_SHARED;_CRT_SECURE_NO_WARNINGS;EXPORT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>Use</PrecompiledHeader>
Expand All @@ -191,7 +191,7 @@
<Link>
<AdditionalDependencies>opengl32.lib;glu32.lib;libcef.lib;libcef_dll_wrapper.lib;%(AdditionalDependencies)</AdditionalDependencies>
<ShowProgress>LinkVerbose</ShowProgress>
<AdditionalLibraryDirectories>$(SolutionDir)packages\cef.sdk.3.1650.1562-pre0\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\cef.sdk.3.1650.1562-pre0\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>$(SolutionDir)packages\cef.sdk.3.1650.1562-pre1\CEF\$(Platform)\$(Configuration);$(SolutionDir)packages\cef.sdk.3.1650.1562-pre1\CEF\$(Platform)\$(Configuration)\VS$(VisualStudioProductVersion)</AdditionalLibraryDirectories>
<GenerateDebugInformation>false</GenerateDebugInformation>
<KeyFile>$(LinkKeyFile)</KeyFile>
</Link>
Expand Down

0 comments on commit edb65a7

Please sign in to comment.