From 1f8a93c37aeb589db34a3517b3fadd5ab35f44f2 Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 28 Apr 2017 13:57:05 +0100 Subject: [PATCH] Add precompiled header file use to qrenderdoc on VS --- qrenderdoc/Code/precompiled.cpp | 25 ++++ qrenderdoc/Code/precompiled.h | 29 ++++ qrenderdoc/Code/pyrenderdoc/PythonContext.cpp | 6 + qrenderdoc/Code/pyrenderdoc/qrenderdoc.i | 8 ++ qrenderdoc/Code/pyrenderdoc/renderdoc.i | 6 + qrenderdoc/qrenderdoc_local.vcxproj | 132 ++++++++++++++++++ qrenderdoc/qrenderdoc_local.vcxproj.filters | 9 ++ 7 files changed, 215 insertions(+) create mode 100644 qrenderdoc/Code/precompiled.cpp create mode 100644 qrenderdoc/Code/precompiled.h diff --git a/qrenderdoc/Code/precompiled.cpp b/qrenderdoc/Code/precompiled.cpp new file mode 100644 index 000000000..6d4c1a7cb --- /dev/null +++ b/qrenderdoc/Code/precompiled.cpp @@ -0,0 +1,25 @@ +/****************************************************************************** + * The MIT License (MIT) + * + * Copyright (c) 2017 Baldur Karlsson + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + ******************************************************************************/ + +#include "precompiled.h" \ No newline at end of file diff --git a/qrenderdoc/Code/precompiled.h b/qrenderdoc/Code/precompiled.h new file mode 100644 index 000000000..733c95b4e --- /dev/null +++ b/qrenderdoc/Code/precompiled.h @@ -0,0 +1,29 @@ +/****************************************************************************** + * The MIT License (MIT) + * + * Copyright (c) 2017 Baldur Karlsson + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to deal + * in the Software without restriction, including without limitation the rights + * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell + * copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN + * THE SOFTWARE. + ******************************************************************************/ + +#pragma once + +#include "Code/CaptureContext.h" +#include "Code/Interface/QRDInterface.h" +#include "Code/QRDUtils.h" diff --git a/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp b/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp index 3a1049f6b..08c6d762e 100644 --- a/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp +++ b/qrenderdoc/Code/pyrenderdoc/PythonContext.cpp @@ -22,10 +22,16 @@ * THE SOFTWARE. ******************************************************************************/ +#ifdef slots +#undef slots +#endif + // must be included first #include #include +#define slots + #if PYSIDE2_ENABLED // PySide Qt integration, must be included before Qt headers // warning C4522: 'Shiboken::AutoDecRef': multiple assignment operators specified diff --git a/qrenderdoc/Code/pyrenderdoc/qrenderdoc.i b/qrenderdoc/Code/pyrenderdoc/qrenderdoc.i index 00ec2e1bf..ad0a756a4 100644 --- a/qrenderdoc/Code/pyrenderdoc/qrenderdoc.i +++ b/qrenderdoc/Code/pyrenderdoc/qrenderdoc.i @@ -5,6 +5,12 @@ // use documentation for docstrings #define DOCUMENT(text) %feature("docstring") text +%begin %{ + +#undef slots + +%} + // import the renderdoc interface that we depend on %import "renderdoc.i" @@ -47,6 +53,8 @@ CONTAINER_TYPEMAPS(QMap) #include "datetime.h" +#define slots + #include "Code/Interface/QRDInterface.h" #include "Code/pyrenderdoc/PythonContext.h" %} diff --git a/qrenderdoc/Code/pyrenderdoc/renderdoc.i b/qrenderdoc/Code/pyrenderdoc/renderdoc.i index 42c4e461f..b05ad9316 100644 --- a/qrenderdoc/Code/pyrenderdoc/renderdoc.i +++ b/qrenderdoc/Code/pyrenderdoc/renderdoc.i @@ -33,6 +33,12 @@ %rename("%(regex:/^GLPipe::(.*)/GL_\\1/)s", regextarget=1, fullname=1, %$isclass) "GLPipe::.*"; %rename("%(regex:/^VKPipe::(.*)/VK_\\1/)s", regextarget=1, fullname=1, %$isclass) "VKPipe::.*"; +%begin %{ + +#undef slots + +%} + %fragment("pyconvert", "header") { static char convert_error[1024] = {}; diff --git a/qrenderdoc/qrenderdoc_local.vcxproj b/qrenderdoc/qrenderdoc_local.vcxproj index 9010b3db4..f80c8379b 100644 --- a/qrenderdoc/qrenderdoc_local.vcxproj +++ b/qrenderdoc/qrenderdoc_local.vcxproj @@ -132,6 +132,9 @@ Level4 true true + Use + precompiled.h + precompiled.h shiboken2.lib;python36.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;%(AdditionalDependencies) @@ -175,6 +178,9 @@ Level4 true true + Use + precompiled.h + precompiled.h shiboken2.lib;python36.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;%(AdditionalDependencies) @@ -216,6 +222,9 @@ Level4 true true + Use + precompiled.h + precompiled.h shiboken2.lib;python36.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;%(AdditionalDependencies) @@ -256,6 +265,9 @@ Level4 true true + Use + precompiled.h + precompiled.h shiboken2.lib;python36.lib;qtmain.lib;Qt5Widgets.lib;Qt5Gui.lib;Qt5Core.lib;%(AdditionalDependencies) @@ -296,6 +308,9 @@ Level4 true true + Use + precompiled.h + precompiled.h shiboken2.lib;python36.lib;qtmaind.lib;Qt5Widgetsd.lib;Qt5Guid.lib;Qt5Cored.lib;%(AdditionalDependencies) @@ -336,6 +351,9 @@ Level4 true true + Use + precompiled.h + precompiled.h shiboken2.lib;python36.lib;qtmaind.lib;Qt5Widgetsd.lib;Qt5Guid.lib;Qt5Cored.lib;%(AdditionalDependencies) @@ -363,262 +381,367 @@ 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + 3rdparty\scintilla\include;3rdparty\scintilla\include\qt;3rdparty\scintilla\src;3rdparty\scintilla\lexlib;%(AdditionalIncludeDirectories) 4458;%(DisableSpecificWarnings) _CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + NotUsing + + + Create + @@ -729,6 +852,8 @@ + NotUsing + @@ -745,10 +870,16 @@ + NotUsing + + NotUsing + + NotUsing + @@ -859,6 +990,7 @@ + diff --git a/qrenderdoc/qrenderdoc_local.vcxproj.filters b/qrenderdoc/qrenderdoc_local.vcxproj.filters index fc5ca26e6..9be6f4f29 100644 --- a/qrenderdoc/qrenderdoc_local.vcxproj.filters +++ b/qrenderdoc/qrenderdoc_local.vcxproj.filters @@ -70,6 +70,9 @@ {7986f203-466f-4a74-93a2-6feeaec3b05b} + + {4869e303-055c-4458-91d6-89ecc827f338} + @@ -588,6 +591,9 @@ Generated Files + + PCH + @@ -896,6 +902,9 @@ Generated Files + + PCH +