mirror/tracy
1
0
Fork 0
mirror of https://github.com/wolfpld/tracy.git synced 2024-11-10 02:31:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix TRACY_NO_FILESELECTOR macro

Browse Source
This commit is contained in:
Stone Tickle 2021-03-17 08:51:24 +09:00
parent ea2a7f639b
commit 1918c0ffe6
No known key found for this signature in database
GPG Key ID: 4DF34BD9C2622309
3 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
profiler/build/unix/build.mk
View File

@ -19,14 +19,18 @@ IMAGE := $(PROJECT)-$(BUILD)
FILTER := ../../../nfd/nfd_win.cpp
include ../../../common/src-from-vcxproj.mk
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
SRC3 += ../../../nfd/nfd_cocoa.m
LIBS += -framework CoreFoundation -framework AppKit
ifdef TRACY_NO_FILESELECTOR
CXXFLAGS += -DTRACY_NO_FILESELECTOR
else
SRC2 += ../../../nfd/nfd_gtk.c
INCLUDES += $(shell pkg-config --cflags gtk+-3.0)
LIBS += $(shell pkg-config --libs gtk+-3.0)
UNAME := $(shell uname -s)
ifeq ($(UNAME),Darwin)
SRC3 += ../../../nfd/nfd_cocoa.m
LIBS += -framework CoreFoundation -framework AppKit
else
SRC2 += ../../../nfd/nfd_gtk.c
INCLUDES += $(shell pkg-config --cflags gtk+-3.0)
LIBS += $(shell pkg-config --libs gtk+-3.0)
endif
endif
include ../../../common/unix.mk

8
profiler/src/main.cpp
View File

@ -15,10 +15,13 @@
#include <GL/gl3w.h>
#include <GLFW/glfw3.h>
#include <memory>
#include "../nfd/nfd.h"
#include <sys/stat.h>
#include <locale.h>
#ifndef TRACY_NO_FILESELECTOR
# include "../nfd/nfd.h"
#endif
#ifdef _WIN32
# include <windows.h>
# include <shellapi.h>
@ -747,6 +750,8 @@ static void DrawContents()
}
}
ImGui::SameLine( 0, ImGui::GetFontSize() * 2 );
#ifndef TRACY_NO_FILESELECTOR
if( ImGui::Button( ICON_FA_FOLDER_OPEN " Open saved trace" ) && !loadThread.joinable() )
{
nfdchar_t* fn;
@ -792,6 +797,7 @@ static void DrawContents()
if( loadThread.joinable() ) { loadThread.join(); }
tracy::BadVersion( badVer );
}
#endif
if( !clients.empty() )
{

2
server/TracySourceView.cpp
View File

@ -3785,6 +3785,7 @@ void SourceView::CheckWrite( size_t line, RegsX86 reg, size_t limit )
}
}
#ifndef TRACY_NO_FILESELECTOR
void SourceView::Save( const Worker& worker, size_t start, size_t stop )
{
assert( start < m_asm.size() );
@ -3867,5 +3868,6 @@ void SourceView::Save( const Worker& worker, size_t start, size_t stop )
}
}
}
#endif
}