diff --git a/manual/tracy.tex b/manual/tracy.tex
index 766f7d06..c11cb55d 100644
--- a/manual/tracy.tex
+++ b/manual/tracy.tex
@@ -1792,12 +1792,12 @@ As an alternative to to runtime symbol resolution, we can set the environment va
the minimal set of info required for offline resolution (a shared library path and an offset into that shared library).
The generated tracy capture will have callstack frames symbols showing \texttt{[unresolved]}.
-The \texttt{tracy-edit} tool can be used to load that capture, perform symbol resolution offline
+The \texttt{update} tool can be used to load that capture, perform symbol resolution offline
(by passing \texttt{-r}) and writing out a new capture with symbols resolved.
-By default \texttt{tracy-edit} will use the original shared libraries paths that were recorded
+By default \texttt{update} will use the original shared libraries paths that were recorded
in the capture (which assumes running in the same machine or a machine with identical
filesystem setup as the one used to run the tracy instrumented application).
- You can do path substitution with the \texttt{-s} option to perform any number of path
+ You can do path substitution with the \texttt{-p} option to perform any number of path
substitions in order to use symbols located elsewhere.
\begin{bclogo}[
@@ -1805,7 +1805,7 @@ noborder=true,
couleur=black!5,
logo=\bcbombe
]{Important}
-Beware that \texttt{tracy-edit} will use any matching symbol file to the path it resolved to (no symbol version checking is done), so if the symbol file doesn't match the code that was used when doing the callstack capturing you will get incorrect results.
+Beware that \texttt{update} will use any matching symbol file to the path it resolved to (no symbol version checking is done), so if the symbol file doesn't match the code that was used when doing the callstack capturing you will get incorrect results.
\end{bclogo}
\subsection{Lua support}
diff --git a/tracy-edit/build/unix/Makefile b/tracy-edit/build/unix/Makefile
deleted file mode 100644
index 035eda1b..00000000
--- a/tracy-edit/build/unix/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-all: release
-
-debug:
- @+make -f debug.mk all
-
-release:
- @+make -f release.mk all
-
-clean:
- @+make -f build.mk clean
-
-db: clean
- @bear -- $(MAKE) -f debug.mk all
- @mv -f compile_commands.json ../../../
-
-.PHONY: all clean debug release db
diff --git a/tracy-edit/build/unix/build.mk b/tracy-edit/build/unix/build.mk
deleted file mode 100644
index 85fb7528..00000000
--- a/tracy-edit/build/unix/build.mk
+++ /dev/null
@@ -1,12 +0,0 @@
-CFLAGS +=
-CXXFLAGS := $(CFLAGS) -std=gnu++17
-DEFINES += -DTRACY_NO_STATISTICS
-INCLUDES := $(shell pkg-config --cflags capstone)
-LIBS += $(shell pkg-config --libs capstone) -lpthread
-PROJECT := tracy-edit
-IMAGE := $(PROJECT)-$(BUILD)
-
-FILTER :=
-include ../../../common/src-from-vcxproj.mk
-
-include ../../../common/unix.mk
diff --git a/tracy-edit/build/unix/debug.mk b/tracy-edit/build/unix/debug.mk
deleted file mode 100644
index a4ec6b6a..00000000
--- a/tracy-edit/build/unix/debug.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-CFLAGS := -g3 -Wall
-DEFINES := -DDEBUG
-BUILD := debug
-
-include ../../../common/unix-debug.mk
-include build.mk
diff --git a/tracy-edit/build/unix/release.mk b/tracy-edit/build/unix/release.mk
deleted file mode 100644
index ccf07661..00000000
--- a/tracy-edit/build/unix/release.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-CFLAGS := -O3
-ifndef TRACY_NO_LTO
-CFLAGS += -flto
-endif
-DEFINES := -DNDEBUG
-BUILD := release
-
-include ../../../common/unix-release.mk
-include build.mk
diff --git a/tracy-edit/build/win32/tracy-edit.sln b/tracy-edit/build/win32/tracy-edit.sln
deleted file mode 100644
index 9b606fbc..00000000
--- a/tracy-edit/build/win32/tracy-edit.sln
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30907.101
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tracy-edit", "tracy-edit.vcxproj", "{447D58BF-94CD-4469-BB90-549C05D03E00}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|x64 = Debug|x64
- Release|x64 = Release|x64
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {447D58BF-94CD-4469-BB90-549C05D03E00}.Debug|x64.ActiveCfg = Debug|x64
- {447D58BF-94CD-4469-BB90-549C05D03E00}.Debug|x64.Build.0 = Debug|x64
- {447D58BF-94CD-4469-BB90-549C05D03E00}.Release|x64.ActiveCfg = Release|x64
- {447D58BF-94CD-4469-BB90-549C05D03E00}.Release|x64.Build.0 = Release|x64
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {3E51386C-43EA-44AC-9F24-AFAFE4D63ADE}
- EndGlobalSection
-EndGlobal
diff --git a/tracy-edit/build/win32/tracy-edit.vcxproj b/tracy-edit/build/win32/tracy-edit.vcxproj
deleted file mode 100644
index 2fb58ced..00000000
--- a/tracy-edit/build/win32/tracy-edit.vcxproj
+++ /dev/null
@@ -1,210 +0,0 @@
-
-
-
-
- Debug
- x64
-
-
- Release
- x64
-
-
-
- 15.0
- {447D58BF-94CD-4469-BB90-549C05D03E00}
- tracy-edit
- 10.0.17763.0
- x64-windows-static
-
-
-
- Application
- true
- v143
- MultiByte
-
-
- Application
- false
- v143
- true
- MultiByte
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- true
-
-
-
- Level3
- Disabled
- true
- true
- true
- TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)
- AdvancedVectorExtensions2
- stdcpplatest
- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone
-
-
- ws2_32.lib;capstone.lib;dbghelp.lib;%(AdditionalDependencies)
- Console
- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\debug\lib
-
-
-
-
- Level3
- MaxSpeed
- true
- true
- true
- true
- true
- TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions)
- AdvancedVectorExtensions2
- stdcpplatest
- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include;$(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\include\capstone;$(VcpkgManifestRoot)\vcpkg_installed\$(VcpkgTriplet)\$(VcpkgTriplet)\include\capstone;$(VcpkgRoot)\installed\$(VcpkgTriplet)\include\capstone
-
-
- true
- true
- ws2_32.lib;capstone.lib;dbghelp.lib;%(AdditionalDependencies)
- Console
- $(ProjectDir)..\..\..\vcpkg_installed\$(VcpkgTriplet)\lib
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/tracy-edit/build/win32/tracy-edit.vcxproj.filters b/tracy-edit/build/win32/tracy-edit.vcxproj.filters
deleted file mode 100644
index 8b77d3ab..00000000
--- a/tracy-edit/build/win32/tracy-edit.vcxproj.filters
+++ /dev/null
@@ -1,366 +0,0 @@
-
-
-
-
- {729c80ee-4d26-4a5e-8f1f-6c075783eb56}
-
-
- {cf23ef7b-7694-4154-830b-00cf053350ea}
-
-
- {e39d3623-47cd-4752-8da9-3ea324f964c1}
-
-
- {9ec18988-3ab7-4c05-a9d0-46c0a68037de}
-
-
- {5ee9ba63-2914-4027-997e-e743a294bba6}
-
-
- {a166d032-7be0-4d07-9f85-a8199cc1ec7c}
-
-
- {438fff23-197c-4b6f-91f0-74f8b3878571}
-
-
- {e5c7021a-e0e4-45c2-b461-e806bc036d5f}
-
-
-
-
- server
-
-
- server
-
-
- src
-
-
- server
-
-
- server
-
-
- server
-
-
- server
-
-
- zstd\common
-
-
- zstd\common
-
-
- zstd\common
-
-
- zstd\common
-
-
- zstd\common
-
-
- zstd\common
-
-
- zstd\common
-
-
- zstd\common
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\decompress
-
-
- zstd\decompress
-
-
- zstd\decompress
-
-
- zstd\decompress
-
-
- zstd\dictBuilder
-
-
- zstd\dictBuilder
-
-
- zstd\dictBuilder
-
-
- zstd\dictBuilder
-
-
- common
-
-
- common
-
-
- common
-
-
- common
-
-
- common
-
-
- src
-
-
- src
-
-
- src
-
-
-
-
-
- server
-
-
- server
-
-
- server
-
-
- server
-
-
- server
-
-
- server
-
-
- server
-
-
- server
-
-
- server
-
-
- server
-
-
- server
-
-
- server
-
-
- server
-
-
- zstd
-
-
- zstd
-
-
- zstd\common
-
-
- zstd\common
-
-
- zstd\common
-
-
- zstd\common
-
-
- zstd\common
-
-
- zstd\common
-
-
- zstd\common
-
-
- zstd\common
-
-
- zstd\common
-
-
- zstd\common
-
-
- zstd\common
-
-
- zstd\common
-
-
- zstd\common
-
-
- zstd\common
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\compress
-
-
- zstd\decompress
-
-
- zstd\decompress
-
-
- zstd\decompress
-
-
- zstd
-
-
- zstd\dictBuilder
-
-
- zstd\dictBuilder
-
-
- zstd\common
-
-
- zstd\compress
-
-
- common
-
-
- common
-
-
- common
-
-
- common
-
-
- common
-
-
- common
-
-
- common
-
-
- common
-
-
- common
-
-
- common
-
-
- common
-
-
- common
-
-
- common
-
-
- common
-
-
- common
-
-
-
-
- zstd\decompress
-
-
-
\ No newline at end of file
diff --git a/tracy-edit/src/tracy-edit.cpp b/tracy-edit/src/tracy-edit.cpp
deleted file mode 100644
index f79c5dab..00000000
--- a/tracy-edit/src/tracy-edit.cpp
+++ /dev/null
@@ -1,213 +0,0 @@
-#ifdef _WIN32
-# include
-#endif
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "../../server/TracyFileRead.hpp"
-#include "../../server/TracyFileWrite.hpp"
-#include "../../server/TracyWorker.hpp"
-#include "../../getopt/getopt.h"
-
-#include "OfflineSymbolResolver.h"
-
-struct Args
-{
- const char* inputTracyPath = nullptr;
- const char* outputTracyPath = nullptr;
- bool verbose = false;
- bool resolveSymbols = false;
- std::vector pathSubstitutions;
- tracy::FileWrite::Compression compressionType = tracy::FileWrite::Compression::Zstd;
- int compressionLevel = 5;
-};
-
-void PrintUsageAndExit()
-{
- std::cerr << "Modify a tracy file" << std::endl;
- std::cerr << "Usage:" << std::endl;
- std::cerr << " tracy-edit [OPTION...]