From aaf87aec966b88756279958619318229e6f242eb Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 8 Feb 2017 17:35:09 +0000 Subject: [PATCH] Add a QTDebug project configuration for compiling against Qt debug DLLs --- .gitignore | 1 + qrenderdoc/qrenderdoc_local.vcxproj | 142 ++++++++++++++++++++++++---- 2 files changed, 122 insertions(+), 21 deletions(-) diff --git a/.gitignore b/.gitignore index 9692ab186..1d0dbf664 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ Debug/ Documentation/ Release/ +QTDebug/ Development/ Development32/ Development64/ diff --git a/qrenderdoc/qrenderdoc_local.vcxproj b/qrenderdoc/qrenderdoc_local.vcxproj index 54411a29d..e8b2610a4 100644 --- a/qrenderdoc/qrenderdoc_local.vcxproj +++ b/qrenderdoc/qrenderdoc_local.vcxproj @@ -1,5 +1,5 @@  - + Development @@ -17,6 +17,14 @@ Development x64 + + QTDebug + Win32 + + + QTDebug + x64 + {A14A6AE5-02B1-35FE-BE59-B3E7C273B40B} @@ -29,7 +37,7 @@ v140 - ..\x64\Release\ + ..\Win32\Release\ false NotSet Application @@ -55,6 +63,24 @@ qrenderdoc + v140 + ..\Win32\Development\ + false + NotSet + Application + $(Platform)\$(Configuration)\ + qrenderdoc + + + v140 + ..\Win32\Development\ + false + NotSet + Application + $(Platform)\$(Configuration)\ + qrenderdoc + + v140 ..\x64\Development\ false @@ -79,28 +105,16 @@ - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - qrenderdoc - qrenderdoc - true - true - false - false - $(SolutionDir)$(Platform)\$(Configuration)\ - $(Platform)\$(Configuration)\ - qrenderdoc - qrenderdoc - true - true - - $(Platform)\$(Configuration)\ $(SolutionDir)$(Platform)\$(Configuration)\ + true + qrenderdoc - - $(Platform)\$(Configuration)\ - $(SolutionDir)$(Platform)\$(Configuration)\ + + false + + + $(SolutionDir)$(Platform)\Development\ @@ -280,6 +294,92 @@ $(SolutionDir)\renderdoc\api\replay + + + $(ProjectDir);generated\;$(SolutionDir)\renderdoc\api\replay;3rdparty\qt\$(Platform)\include;3rdparty\qt\$(Platform)\include\QtWidgets;3rdparty\qt\$(Platform)\include\QtGui;3rdparty\qt\$(Platform)\include\QtCore;%(AdditionalIncludeDirectories) + /wd4718 /wd4127 /wd4714 /wd4100 /wd4512 -Zc:strictStrings -Zc:throwingNew -w34189 -w44996 -w44456 -w44457 %(AdditionalOptions) + $(Platform)\$(Configuration)\ + false + ProgramDatabase + 4577;%(DisableSpecificWarnings) + Sync + $(Platform)\$(Configuration)\ + Disabled + _WINDOWS;UNICODE;WIN32;WIN64;RENDERDOC_PLATFORM_WIN32;SCINTILLA_QT=1;MAKING_LIBRARY=1;SCI_LEXER=1;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;%(PreprocessorDefinitions) + false + MultiThreadedDebugDLL + true + true + true + Level4 + true + true + + + qtmaind.lib;shell32.lib;Qt5Widgetsd.lib;Qt5Guid.lib;Qt5Cored.lib;%(AdditionalDependencies) + 3rdparty\qt\$(Platform)\lib%(AdditionalLibraryDirectories) + "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) + true + true + true + $(OutDir)\qrenderdoc.exe + true + Windows + true + + + Unsigned + None + 0 + + + _WINDOWS;UNICODE;WIN32;WIN64;RENDERDOC_PLATFORM_WIN32;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions) + $(SolutionDir)\renderdoc\api\replay + + + + + $(ProjectDir);generated\;$(SolutionDir)\renderdoc\api\replay;3rdparty\qt\$(Platform)\include;3rdparty\qt\$(Platform)\include\QtWidgets;3rdparty\qt\$(Platform)\include\QtGui;3rdparty\qt\$(Platform)\include\QtCore;%(AdditionalIncludeDirectories) + /wd4718 /wd4127 /wd4714 /wd4100 /wd4512 -Zc:strictStrings -Zc:throwingNew -w34189 -w44996 -w44456 -w44457 %(AdditionalOptions) + $(Platform)\$(Configuration)\ + false + ProgramDatabase + 4577;%(DisableSpecificWarnings) + Sync + $(Platform)\$(Configuration)\ + Disabled + _WINDOWS;UNICODE;WIN32;RENDERDOC_PLATFORM_WIN32;SCINTILLA_QT=1;MAKING_LIBRARY=1;SCI_LEXER=1;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;%(PreprocessorDefinitions) + false + MultiThreadedDebugDLL + true + true + true + Level4 + true + true + + + qtmaind.lib;shell32.lib;Qt5Widgetsd.lib;Qt5Guid.lib;Qt5Cored.lib;%(AdditionalDependencies) + 3rdparty\qt\$(Platform)\lib%(AdditionalLibraryDirectories) + "/MANIFESTDEPENDENCY:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' publicKeyToken='6595b64144ccf1df' language='*' processorArchitecture='*'" %(AdditionalOptions) + true + true + true + $(OutDir)\qrenderdoc.exe + true + Windows + true + + + Unsigned + None + 0 + + + _WINDOWS;UNICODE;WIN32;WIN64;RENDERDOC_PLATFORM_WIN32;QT_WIDGETS_LIB;QT_GUI_LIB;QT_CORE_LIB;_DEBUG;%(PreprocessorDefinitions) + $(SolutionDir)\renderdoc\api\replay + + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories)