mirror of
https://github.com/baldurk/renderdoc.git
synced 2026-05-12 13:00:32 +00:00
Use relative paths for 3rdparty headers, don't add to search paths
* Unfortunately scintilla assumes its headers are all in the search path so where possible we only add those folders when compiling scintilla source, not our own.
This commit is contained in:
@@ -12,8 +12,8 @@
|
||||
#ifndef SCINTILLAEDITBASE_H
|
||||
#define SCINTILLAEDITBASE_H
|
||||
|
||||
#include "Platform.h"
|
||||
#include "Scintilla.h"
|
||||
#include "../Platform.h"
|
||||
#include "../Scintilla.h"
|
||||
|
||||
#include <QAbstractScrollArea>
|
||||
#include <QMimeData>
|
||||
|
||||
@@ -23,8 +23,8 @@
|
||||
******************************************************************************/
|
||||
|
||||
#include "ScintillaSyntax.h"
|
||||
#include "SciLexer.h"
|
||||
#include "ScintillaEdit.h"
|
||||
#include "3rdparty/scintilla/include/SciLexer.h"
|
||||
#include "3rdparty/scintilla/include/qt/ScintillaEdit.h"
|
||||
|
||||
static const char *hlsl_keywords[2] = {
|
||||
// keyword set 0:
|
||||
|
||||
@@ -774,7 +774,7 @@
|
||||
<customwidget>
|
||||
<class>ToolWindowManager</class>
|
||||
<extends>QWidget</extends>
|
||||
<header>ToolWindowManager.h</header>
|
||||
<header>3rdparty/toolwindowmanager/ToolWindowManager.h</header>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>BufferFormatSpecifier</class>
|
||||
|
||||
@@ -25,12 +25,12 @@
|
||||
#include "CaptureDialog.h"
|
||||
#include <QSortFilterProxyModel>
|
||||
#include <QStandardItemModel>
|
||||
#include "3rdparty/flowlayout/FlowLayout.h"
|
||||
#include "3rdparty/toolwindowmanager/ToolWindowManager.h"
|
||||
#include "Code/QRDUtils.h"
|
||||
#include "Code/qprocessinfo.h"
|
||||
#include "Windows/Dialogs/VirtualFileDialog.h"
|
||||
#include "FlowLayout.h"
|
||||
#include "LiveCapture.h"
|
||||
#include "ToolWindowManager.h"
|
||||
#include "ui_CaptureDialog.h"
|
||||
|
||||
#define JSON_ID "rdocCaptureSettings"
|
||||
|
||||
@@ -30,10 +30,10 @@
|
||||
#include <QScrollBar>
|
||||
#include <QToolBar>
|
||||
#include <QToolButton>
|
||||
#include "3rdparty/toolwindowmanager/ToolWindowManager.h"
|
||||
#include "Code/qprocessinfo.h"
|
||||
#include "Widgets/Extended/RDLabel.h"
|
||||
#include "Windows/MainWindow.h"
|
||||
#include "ToolWindowManager.h"
|
||||
#include "ui_LiveCapture.h"
|
||||
|
||||
static const int PIDRole = Qt::UserRole + 1;
|
||||
|
||||
@@ -27,8 +27,8 @@
|
||||
#include <stdint.h>
|
||||
#include <QMainWindow>
|
||||
#include <QTimer>
|
||||
#include "3rdparty/toolwindowmanager/ToolWindowManager.h"
|
||||
#include "Code/CaptureContext.h"
|
||||
#include "ToolWindowManager.h"
|
||||
|
||||
namespace Ui
|
||||
{
|
||||
|
||||
@@ -401,7 +401,7 @@
|
||||
<customwidget>
|
||||
<class>ToolWindowManager</class>
|
||||
<extends>QWidget</extends>
|
||||
<header>ToolWindowManager.h</header>
|
||||
<header>3rdparty/toolwindowmanager/ToolWindowManager.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources>
|
||||
|
||||
@@ -24,10 +24,10 @@
|
||||
|
||||
#include "ShaderViewer.h"
|
||||
#include <QHBoxLayout>
|
||||
#include "3rdparty/scintilla/include/SciLexer.h"
|
||||
#include "3rdparty/scintilla/include/qt/ScintillaEdit.h"
|
||||
#include "3rdparty/toolwindowmanager/ToolWindowManager.h"
|
||||
#include "Code/ScintillaSyntax.h"
|
||||
#include "SciLexer.h"
|
||||
#include "ScintillaEdit.h"
|
||||
#include "ui_ShaderViewer.h"
|
||||
|
||||
ShaderViewer::ShaderViewer(CaptureContext *ctx, ShaderReflection *shader, ShaderStageType stage,
|
||||
|
||||
@@ -190,7 +190,7 @@
|
||||
<customwidget>
|
||||
<class>ToolWindowManager</class>
|
||||
<extends>QWidget</extends>
|
||||
<header>ToolWindowManager.h</header>
|
||||
<header>3rdparty/toolwindowmanager/ToolWindowManager.h</header>
|
||||
</customwidget>
|
||||
</customwidgets>
|
||||
<resources/>
|
||||
|
||||
@@ -33,6 +33,7 @@
|
||||
#include <QMenu>
|
||||
#include <QPainter>
|
||||
#include <QStyledItemDelegate>
|
||||
#include "3rdparty/flowlayout/FlowLayout.h"
|
||||
#include "3rdparty/toolwindowmanager/ToolWindowManagerArea.h"
|
||||
#include "Code/CaptureContext.h"
|
||||
#include "Code/QRDUtils.h"
|
||||
@@ -40,7 +41,6 @@
|
||||
#include "Widgets/ResourcePreview.h"
|
||||
#include "Widgets/TextureGoto.h"
|
||||
#include "BufferViewer.h"
|
||||
#include "FlowLayout.h"
|
||||
#include "MainWindow.h"
|
||||
#include "ui_TextureViewer.h"
|
||||
|
||||
|
||||
@@ -1205,7 +1205,7 @@
|
||||
<customwidget>
|
||||
<class>ToolWindowManager</class>
|
||||
<extends>QWidget</extends>
|
||||
<header>ToolWindowManager.h</header>
|
||||
<header>3rdparty/toolwindowmanager/ToolWindowManager.h</header>
|
||||
</customwidget>
|
||||
<customwidget>
|
||||
<class>CustomPaintWidget</class>
|
||||
|
||||
Reference in New Issue
Block a user