Merge pull request #220 from ktf/patch-1

Fix compilation on macOS 11.0.0 with XCode 12.5
This commit is contained in:
Bartosz Taudul 2021-05-17 13:37:26 +02:00 committed by GitHub
commit 2544a91c6b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 6 additions and 6 deletions

View File

@ -9,8 +9,8 @@
#include <assert.h>
#include <stdint.h>
#include "../imgui/imgui.h"
#include "../imgui/imgui_internal.h"
#include "imgui.h"
#include "imgui_internal.h"
#include "../common/TracyForceInline.hpp"
#include "IconsFontAwesome5.h"

View File

@ -2,7 +2,7 @@
#include "TracyMouse.hpp"
#include "../imgui/imgui_internal.h"
#include "imgui_internal.h"
namespace tracy
{

View File

@ -1,7 +1,7 @@
#ifndef __TRACYMOUSE_HPP__
#define __TRACYMOUSE_HPP__
#include "../imgui/imgui.h"
#include "imgui.h"
namespace tracy
{

View File

@ -4,7 +4,7 @@
#include <capstone.h>
#include "../imgui/imgui.h"
#include "imgui.h"
#include "TracyCharUtil.hpp"
#include "TracyColor.hpp"
#include "TracyFilesystem.hpp"

View File

@ -45,7 +45,7 @@
#include "TracyStackFrames.hpp"
#include "TracyView.hpp"
#include "../imgui/imgui_internal.h"
#include "imgui_internal.h"
#ifndef TRACY_NO_FILESELECTOR
# include "../nfd/nfd.h"