mirror of
https://github.com/wolfpld/tracy.git
synced 2024-12-02 09:44:35 +00:00
Merge pull request #220 from ktf/patch-1
Fix compilation on macOS 11.0.0 with XCode 12.5
This commit is contained in:
commit
2544a91c6b
@ -9,8 +9,8 @@
|
|||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
#include "../imgui/imgui.h"
|
#include "imgui.h"
|
||||||
#include "../imgui/imgui_internal.h"
|
#include "imgui_internal.h"
|
||||||
|
|
||||||
#include "../common/TracyForceInline.hpp"
|
#include "../common/TracyForceInline.hpp"
|
||||||
#include "IconsFontAwesome5.h"
|
#include "IconsFontAwesome5.h"
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
#include "TracyMouse.hpp"
|
#include "TracyMouse.hpp"
|
||||||
|
|
||||||
#include "../imgui/imgui_internal.h"
|
#include "imgui_internal.h"
|
||||||
|
|
||||||
namespace tracy
|
namespace tracy
|
||||||
{
|
{
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
#ifndef __TRACYMOUSE_HPP__
|
#ifndef __TRACYMOUSE_HPP__
|
||||||
#define __TRACYMOUSE_HPP__
|
#define __TRACYMOUSE_HPP__
|
||||||
|
|
||||||
#include "../imgui/imgui.h"
|
#include "imgui.h"
|
||||||
|
|
||||||
namespace tracy
|
namespace tracy
|
||||||
{
|
{
|
||||||
|
@ -4,7 +4,7 @@
|
|||||||
|
|
||||||
#include <capstone.h>
|
#include <capstone.h>
|
||||||
|
|
||||||
#include "../imgui/imgui.h"
|
#include "imgui.h"
|
||||||
#include "TracyCharUtil.hpp"
|
#include "TracyCharUtil.hpp"
|
||||||
#include "TracyColor.hpp"
|
#include "TracyColor.hpp"
|
||||||
#include "TracyFilesystem.hpp"
|
#include "TracyFilesystem.hpp"
|
||||||
|
@ -45,7 +45,7 @@
|
|||||||
#include "TracyStackFrames.hpp"
|
#include "TracyStackFrames.hpp"
|
||||||
#include "TracyView.hpp"
|
#include "TracyView.hpp"
|
||||||
|
|
||||||
#include "../imgui/imgui_internal.h"
|
#include "imgui_internal.h"
|
||||||
|
|
||||||
#ifndef TRACY_NO_FILESELECTOR
|
#ifndef TRACY_NO_FILESELECTOR
|
||||||
# include "../nfd/nfd.h"
|
# include "../nfd/nfd.h"
|
||||||
|
Loading…
Reference in New Issue
Block a user