lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-09-25 15:16:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Locate breakpad libraries via $(PlatformToolset)

Browse Source 
* This means people building on VS2013 don't need to rebuild breakpad
  locally to link successfully.
* Committed binaries built on VS2012 Update 4 and VS Express 2013 for
  Desktop, which will hopefully work for everyone.
This commit is contained in:
baldurk
2014-09-11 18:59:32 +01:00
parent 35884170eb
commit 9e90eda3b5
31 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
README.md
+1 -1
View File
@@ -34,7 +34,7 @@ Building RenderDoc is fairly straight forward.
### Windows ###
The main [renderdoc.sln](renderdoc.sln) is a VS2010 solution. To build on later VS versions, simply open & upgrade. You will also need to rebuild breakpad, just build `Release|Win32` and `Release|x64` in [breakpad.sln](breakpad/breakpad.sln).
The main [renderdoc.sln](renderdoc.sln) is a VS2010 solution. To build on later VS versions, simply open & upgrade, I've tested building on VS2012 and VS2013 without issues.
The only external dependency should be the Windows 8.1 SDK. The 8.0 SDK should also work fine, but [the vcxproj](renderdoc/renderdoc.vcxproj) is set up to look in `$(ProgramFiles)\Windows Kits\8.1\` for the necessary paths. If your SDK is installed elsewhere you'll also need to change these locally. You can also compile only against the June 2010 DirectX SDK if you undefine `INCLUDE_D3D_11_1` in `d3d11_common.h`.
breakpad/client/windows/common.vcxproj
+4 -4
View File
@@ -309,8 +309,8 @@
<PreprocessorDefinitions>_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;CHROMIUM_BUILD;TOOLKIT_VIEWS=1;ENABLE_GPU=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;NVALGRIND;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<PostBuildEvent>
<Command>mkdir $(SolutionDir)\lib32\ 2&gt; nul
copy $(TargetPath) $(SolutionDir)\lib32\</Command>
<Command>mkdir $(SolutionDir)\$(PlatformToolset)\lib32\ 2&gt; nul
copy $(TargetPath) $(SolutionDir)\$(PlatformToolset)\lib32\</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -363,8 +363,8 @@ copy $(TargetPath) $(SolutionDir)\lib32\</Command>
<PreprocessorDefinitions>_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;CHROMIUM_BUILD;TOOLKIT_VIEWS=1;ENABLE_GPU=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NO_TCMALLOC;NDEBUG;NVALGRIND;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<PostBuildEvent>
<Command>mkdir $(SolutionDir)\lib64\ 2&gt; nul
copy $(TargetPath) $(SolutionDir)\lib64\</Command>
<Command>mkdir $(SolutionDir)\$(PlatformToolset)\lib64\ 2&gt; nul
copy $(TargetPath) $(SolutionDir)\$(PlatformToolset)\lib64\</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
breakpad/client/windows/crash_generation/crash_generation_client.vcxproj
+4 -4
View File
@@ -308,8 +308,8 @@
<PreprocessorDefinitions>_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;CHROMIUM_BUILD;TOOLKIT_VIEWS=1;ENABLE_GPU=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;NVALGRIND;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<PostBuildEvent>
<Command>mkdir $(SolutionDir)\lib32\ 2&gt; nul
copy $(TargetPath) $(SolutionDir)\lib32\</Command>
<Command>mkdir $(SolutionDir)\$(PlatformToolset)\lib32\ 2&gt; nul
copy $(TargetPath) $(SolutionDir)\$(PlatformToolset)\lib32\</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -362,8 +362,8 @@ copy $(TargetPath) $(SolutionDir)\lib32\</Command>
<PreprocessorDefinitions>_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;CHROMIUM_BUILD;TOOLKIT_VIEWS=1;ENABLE_GPU=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NO_TCMALLOC;NDEBUG;NVALGRIND;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<PostBuildEvent>
<Command>mkdir $(SolutionDir)\lib64\ 2&gt; nul
copy $(TargetPath) $(SolutionDir)\lib64\</Command>
<Command>mkdir $(SolutionDir)\$(PlatformToolset)\lib64\ 2&gt; nul
copy $(TargetPath) $(SolutionDir)\$(PlatformToolset)\lib64\</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
breakpad/client/windows/crash_generation/crash_generation_server.vcxproj
+4 -4
View File
@@ -308,8 +308,8 @@
<PreprocessorDefinitions>_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;CHROMIUM_BUILD;TOOLKIT_VIEWS=1;ENABLE_GPU=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;NVALGRIND;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<PostBuildEvent>
<Command>mkdir $(SolutionDir)\lib32\ 2&gt; nul
copy $(TargetPath) $(SolutionDir)\lib32\</Command>
<Command>mkdir $(SolutionDir)\$(PlatformToolset)\lib32\ 2&gt; nul
copy $(TargetPath) $(SolutionDir)\$(PlatformToolset)\lib32\</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -362,8 +362,8 @@ copy $(TargetPath) $(SolutionDir)\lib32\</Command>
<PreprocessorDefinitions>_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;CHROMIUM_BUILD;TOOLKIT_VIEWS=1;ENABLE_GPU=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NO_TCMALLOC;NDEBUG;NVALGRIND;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<PostBuildEvent>
<Command>mkdir $(SolutionDir)\lib64\ 2&gt; nul
copy $(TargetPath) $(SolutionDir)\lib64\</Command>
<Command>mkdir $(SolutionDir)\$(PlatformToolset)\lib64\ 2&gt; nul
copy $(TargetPath) $(SolutionDir)\$(PlatformToolset)\lib64\</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
breakpad/client/windows/handler/exception_handler.vcxproj
+4 -4
View File
@@ -308,8 +308,8 @@
<PreprocessorDefinitions>_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;CHROMIUM_BUILD;TOOLKIT_VIEWS=1;ENABLE_GPU=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NDEBUG;NVALGRIND;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<PostBuildEvent>
<Command>mkdir $(SolutionDir)\lib32\ 2&gt; nul
copy $(TargetPath) $(SolutionDir)\lib32\</Command>
<Command>mkdir $(SolutionDir)\$(PlatformToolset)\lib32\ 2&gt; nul
copy $(TargetPath) $(SolutionDir)\$(PlatformToolset)\lib32\</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -362,8 +362,8 @@ copy $(TargetPath) $(SolutionDir)\lib32\</Command>
<PreprocessorDefinitions>_WIN32_WINNT=0x0600;WINVER=0x0600;WIN32;_WINDOWS;_HAS_EXCEPTIONS=0;NOMINMAX;_CRT_RAND_S;CERT_CHAIN_PARA_HAS_EXTRA_FIELDS;WIN32_LEAN_AND_MEAN;_SECURE_ATL;CHROMIUM_BUILD;TOOLKIT_VIEWS=1;ENABLE_GPU=1;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_WARNINGS;_CRT_NONSTDC_NO_DEPRECATE;NO_TCMALLOC;NDEBUG;NVALGRIND;%(PreprocessorDefinitions);%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ResourceCompile>
<PostBuildEvent>
<Command>mkdir $(SolutionDir)\lib64\ 2&gt; nul
copy $(TargetPath) $(SolutionDir)\lib64\</Command>
<Command>mkdir $(SolutionDir)\$(PlatformToolset)\lib64\ 2&gt; nul
copy $(TargetPath) $(SolutionDir)\$(PlatformToolset)\lib64\</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemGroup>
breakpad/lib32/breakpad_common.lib → breakpad/v100/lib32/breakpad_common.lib
BIN
View File
Binary file not shown.
breakpad/lib32/crash_generation_client.lib → breakpad/v100/lib32/crash_generation_client.lib
BIN
View File
Binary file not shown.
breakpad/lib32/crash_generation_server.lib → breakpad/v100/lib32/crash_generation_server.lib
BIN
View File
Binary file not shown.
breakpad/lib32/exception_handler.lib → breakpad/v100/lib32/exception_handler.lib
BIN
View File
Binary file not shown.
breakpad/lib64/breakpad_common.lib → breakpad/v100/lib64/breakpad_common.lib
BIN
View File
Binary file not shown.
breakpad/lib64/crash_generation_client.lib → breakpad/v100/lib64/crash_generation_client.lib
BIN
View File
Binary file not shown.
breakpad/lib64/crash_generation_server.lib → breakpad/v100/lib64/crash_generation_server.lib
BIN
View File
Binary file not shown.
breakpad/lib64/exception_handler.lib → breakpad/v100/lib64/exception_handler.lib
BIN
View File
Binary file not shown.
breakpad/v110/lib32/breakpad_common.lib
BIN
View File
Binary file not shown.
breakpad/v110/lib32/crash_generation_client.lib
BIN
View File
Binary file not shown.
breakpad/v110/lib32/crash_generation_server.lib
BIN
View File
Binary file not shown.
breakpad/v110/lib32/exception_handler.lib
BIN
View File
Binary file not shown.
breakpad/v110/lib64/breakpad_common.lib
BIN
View File
Binary file not shown.
breakpad/v110/lib64/crash_generation_client.lib
BIN
View File
Binary file not shown.
breakpad/v110/lib64/crash_generation_server.lib
BIN
View File
Binary file not shown.
breakpad/v110/lib64/exception_handler.lib
BIN
View File
Binary file not shown.
breakpad/v120/lib32/breakpad_common.lib
BIN
View File
Binary file not shown.
breakpad/v120/lib32/crash_generation_client.lib
BIN
View File
Binary file not shown.
breakpad/v120/lib32/crash_generation_server.lib
BIN
View File
Binary file not shown.
breakpad/v120/lib32/exception_handler.lib
BIN
View File
Binary file not shown.
breakpad/v120/lib64/breakpad_common.lib
BIN
View File
Binary file not shown.
breakpad/v120/lib64/crash_generation_client.lib
BIN
View File
Binary file not shown.
breakpad/v120/lib64/crash_generation_server.lib
BIN
View File
Binary file not shown.
breakpad/v120/lib64/exception_handler.lib
BIN
View File
Binary file not shown.
renderdoc/renderdoc.vcxproj
+4 -4
View File
@@ -69,7 +69,7 @@
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IncludePath>$(ProgramFiles)\Windows Kits\8.1\Debuggers\inc;$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(VSInstallDir)\DIA SDK\include;$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
<LibraryPath>$(ProgramFiles)\Windows Kits\8.1\lib\win8\um\x86;$(SolutionDir)\breakpad\lib32;$(LibraryPath)</LibraryPath>
<LibraryPath>$(ProgramFiles)\Windows Kits\8.1\lib\win8\um\x86;$(SolutionDir)\breakpad\$(PlatformToolset)\lib32;$(LibraryPath)</LibraryPath>
<ExecutablePath>$(ProgramFiles)\Windows Kits\8.1\bin\x86;$(ExecutablePath)</ExecutablePath>
<ExcludePath>$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(ExcludePath)</ExcludePath>
</PropertyGroup>
@@ -77,7 +77,7 @@
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)\$(Platform)\$(Configuration)\</OutDir>
<IncludePath>$(ProgramFiles)\Windows Kits\8.1\Debuggers\inc;$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(VSInstallDir)\DIA SDK\include;$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
<LibraryPath>$(ProgramFiles)\Windows Kits\8.1\lib\win8\um\x64;$(SolutionDir)\breakpad\lib64;$(LibraryPath)</LibraryPath>
<LibraryPath>$(ProgramFiles)\Windows Kits\8.1\lib\win8\um\x64;$(SolutionDir)\breakpad\$(PlatformToolset)\lib64;$(LibraryPath)</LibraryPath>
<ExecutablePath>$(ProgramFiles)\Windows Kits\8.1\bin;$(ExecutablePath)</ExecutablePath>
<ExcludePath>$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(ExcludePath)</ExcludePath>
</PropertyGroup>
@@ -85,7 +85,7 @@
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
<IncludePath>$(ProgramFiles)\Windows Kits\8.1\Debuggers\inc;$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(VSInstallDir)\DIA SDK\include;$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
<LibraryPath>$(ProgramFiles)\Windows Kits\8.1\lib\win8\um\x86;$(SolutionDir)\breakpad\lib32;$(LibraryPath)</LibraryPath>
<LibraryPath>$(ProgramFiles)\Windows Kits\8.1\lib\win8\um\x86;$(SolutionDir)\breakpad\$(PlatformToolset)\lib32;$(LibraryPath)</LibraryPath>
<ExecutablePath>$(ProgramFiles)\Windows Kits\8.1\bin\x86;$(ExecutablePath)</ExecutablePath>
<ExcludePath>$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(ExcludePath)</ExcludePath>
</PropertyGroup>
@@ -93,7 +93,7 @@
<LinkIncremental>false</LinkIncremental>
<OutDir>$(SolutionDir)\$(Platform)\$(Configuration)\</OutDir>
<IncludePath>$(ProgramFiles)\Windows Kits\8.1\Debuggers\inc;$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(VSInstallDir)\DIA SDK\include;$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
<LibraryPath>$(ProgramFiles)\Windows Kits\8.1\lib\win8\um\x64;$(SolutionDir)\breakpad\lib64;$(LibraryPath)</LibraryPath>
<LibraryPath>$(ProgramFiles)\Windows Kits\8.1\lib\win8\um\x64;$(SolutionDir)\breakpad\$(PlatformToolset)\lib64;$(LibraryPath)</LibraryPath>
<ExecutablePath>$(ProgramFiles)\Windows Kits\8.1\bin;$(ExecutablePath)</ExecutablePath>
<ExcludePath>$(ProgramFiles)\Windows Kits\8.1\Include\um;$(ProgramFiles)\Windows Kits\8.1\Include\shared;$(ExcludePath)</ExcludePath>
</PropertyGroup>
renderdoccmd/renderdoccmd.vcxproj
+4 -4
View File
@@ -65,25 +65,25 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\breakpad\lib32;$(LibraryPath)</LibraryPath>
<LibraryPath>$(SolutionDir)\breakpad\$(PlatformToolset)\lib32;$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Profile|x64'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\breakpad\lib64;$(LibraryPath)</LibraryPath>
<LibraryPath>$(SolutionDir)\breakpad\$(PlatformToolset)\lib64;$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)\$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\breakpad\lib32;$(LibraryPath)</LibraryPath>
<LibraryPath>$(SolutionDir)\breakpad\$(PlatformToolset)\lib32;$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
<IncludePath>$(SolutionDir)\breakpad;$(IncludePath)</IncludePath>
<LibraryPath>$(SolutionDir)\breakpad\lib64;$(LibraryPath)</LibraryPath>
<LibraryPath>$(SolutionDir)\breakpad\$(PlatformToolset)\lib64;$(LibraryPath)</LibraryPath>
<OutDir>$(SolutionDir)\$(Platform)\$(Configuration)\</OutDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Profile|Win32'">