Skip to content

Commit c7696d9

Browse files
Fix tracy includes
1 parent 7f550a6 commit c7696d9

File tree

8 files changed

+9
-8
lines changed

8 files changed

+9
-8
lines changed

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ UNAME_M := $(shell uname -m)
88
rwildcard=$(wildcard $1$2) $(foreach d,$(wildcard $1*),$(call rwildcard,$d/,$2))
99
CC_IS_CLANG := $(shell $(CC) --version | grep -q clang && echo true || echo false)
1010

11-
PACKAGES := capstone freetype2 glfw3 libavcodec libavformat libavutil libswresample libuv zlib libcurl
11+
PACKAGES := capstone freetype2 glfw3 libavcodec libavformat libavutil libswresample libuv zlib libcurl luajit fmt md4c libluv
1212

1313
LOCALES := el es_ES fr ja pt_BR uk zh_CN
1414

@@ -39,6 +39,7 @@ CPPFLAGS += -Ithird_party/luv/deps/lua-compat-5.3/c-api
3939
CPPFLAGS += -Ithird_party/magic_enum/include/magic_enum
4040
CPPFLAGS += -Ithird_party/md4c/src
4141
CPPFLAGS += -Ithird_party/multipart-parser-c
42+
CPPFLAGS += -Ithird_party/tracy/public
4243
CPPFLAGS += -Ithird_party/ucl -Ithird_party/ucl/include
4344
CPPFLAGS += -Ithird_party/uriparser/include
4445
CPPFLAGS += -Ithird_party/zep/extensions

src/core/DynaRec_aa64/recompiler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include "fmt/format.h"
3232
#include "regAllocation.h"
3333
#include "spu/interface.h"
34-
#include "tracy/public/tracy/Tracy.hpp"
34+
#include "tracy/Tracy.hpp"
3535

3636
#define HOST_REG_CACHE_OFFSET(x) ((uintptr_t) & m_hostRegisterCache[(x)] - (uintptr_t)this)
3737
#define GPR_OFFSET(x) ((uintptr_t) & m_regs.GPR.r[(x)] - (uintptr_t)this)

src/core/DynaRec_x64/recompiler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
#include "profiler.h"
3535
#include "regAllocation.h"
3636
#include "spu/interface.h"
37-
#include "tracy/public/tracy/Tracy.hpp"
37+
#include "tracy/Tracy.hpp"
3838

3939
#define HOST_REG_CACHE_OFFSET(x) ((uintptr_t) & m_hostRegisterCache[(x)] - (uintptr_t)this)
4040
#define GPR_OFFSET(x) ((uintptr_t) & m_regs.GPR.r[(x)] - (uintptr_t)this)

src/core/OpenGL_GPU/gpu_opengl.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include "core/system.h"
3030
#include "fmt/format.h"
3131
#include "gui/gui.h"
32-
#include "tracy/public/tracy/Tracy.hpp"
32+
#include "tracy/Tracy.hpp"
3333

3434
std::unique_ptr<PCSX::GPU> PCSX::GPU::getOpenGL() { return std::unique_ptr<PCSX::GPU>(new PCSX::OpenGL_GPU()); }
3535

src/core/psxinterpreter.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "core/pgxp_gte.h"
2727
#include "core/psxemulator.h"
2828
#include "core/r3000a.h"
29-
#include "tracy/public/tracy/Tracy.hpp"
29+
#include "tracy/Tracy.hpp"
3030

3131
#undef _PC_
3232
#undef _Op_

src/gpu/soft/gpu.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include "gpu/soft/soft.h"
2727
#include "imgui.h"
2828
#include "support/imgui-helpers.h"
29-
#include "tracy/public/tracy/Tracy.hpp"
29+
#include "tracy/Tracy.hpp"
3030

3131
#define GPUSTATUS_DMABITS 0x60000000
3232
#define GPUSTATUS_READYFORCOMMANDS 0x10000000

src/gui/gui.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ extern "C" {
8888
#include "support/uvfile.h"
8989
#include "support/zfile.h"
9090
#include "supportpsx/binloader.h"
91-
#include "tracy/public/tracy/Tracy.hpp"
91+
#include "tracy/Tracy.hpp"
9292

9393
#ifdef _WIN32
9494
extern "C" {

src/main/main.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
#include "support/binpath.h"
4242
#include "support/uvfile.h"
4343
#include "support/version.h"
44-
#include "tracy/public/tracy/Tracy.hpp"
44+
#include "tracy/Tracy.hpp"
4545

4646
static PCSX::UI *s_ui;
4747

0 commit comments

Comments
 (0)