diff --git a/library/unix/Makefile b/library/unix/Makefile deleted file mode 100644 index 7604a349..00000000 --- a/library/unix/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -all: release - -debug: - @$(MAKE) -f debug.mk all - -release: - @$(MAKE) -f release.mk all - -clean: - @$(MAKE) -f build.mk clean - rm -f libtracy-*.so - -db: clean - @bear -- $(MAKE) -f debug.mk all - @mv -f compile_commands.json ../../ - -.PHONY: all clean debug release db diff --git a/library/unix/build.mk b/library/unix/build.mk deleted file mode 100644 index 9fa7c538..00000000 --- a/library/unix/build.mk +++ /dev/null @@ -1,12 +0,0 @@ -CFLAGS += -CXXFLAGS := $(CFLAGS) -std=c++11 -fpic -DEFINES += -DTRACY_ENABLE -INCLUDES := -LIBS := -lpthread -ldl -PROJECT := libtracy -IMAGE := $(PROJECT)-$(BUILD).so -SHARED_LIBRARY := yes - -SRC := ../../public/TracyClient.cpp - -include ../../common/unix.mk diff --git a/library/unix/debug.mk b/library/unix/debug.mk deleted file mode 100644 index cec9c76d..00000000 --- a/library/unix/debug.mk +++ /dev/null @@ -1,13 +0,0 @@ -ARCH := $(shell uname -m) - -CFLAGS := -g3 -Wall -DEFINES := -DDEBUG -BUILD := debug - -ifndef TRACY_NO_ISA_EXTENSIONS -ifeq ($(ARCH),x86_64) -CFLAGS += -msse4.1 -endif -endif - -include build.mk diff --git a/library/unix/release.mk b/library/unix/release.mk deleted file mode 100644 index 10b56542..00000000 --- a/library/unix/release.mk +++ /dev/null @@ -1,13 +0,0 @@ -ARCH := $(shell uname -m) - -CFLAGS := -O3 -s -DEFINES := -DNDEBUG -BUILD := release - -ifndef TRACY_NO_ISA_EXTENSIONS -ifeq ($(ARCH),x86_64) -CFLAGS += -msse4.1 -endif -endif - -include build.mk diff --git a/library/win32/TracyProfiler.sln b/library/win32/TracyProfiler.sln deleted file mode 100644 index 29273b6f..00000000 --- a/library/win32/TracyProfiler.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}") = "TracyProfiler", "TracyProfiler.vcxproj", "{C5B825D3-F140-45AB-8A47-B740E56631FB}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Release|x64 = Release|x64 - ReleaseOnDemand|x64 = ReleaseOnDemand|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {C5B825D3-F140-45AB-8A47-B740E56631FB}.Release|x64.ActiveCfg = Release|x64 - {C5B825D3-F140-45AB-8A47-B740E56631FB}.Release|x64.Build.0 = Release|x64 - {C5B825D3-F140-45AB-8A47-B740E56631FB}.ReleaseOnDemand|x64.ActiveCfg = ReleaseOnDemand|x64 - {C5B825D3-F140-45AB-8A47-B740E56631FB}.ReleaseOnDemand|x64.Build.0 = ReleaseOnDemand|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {E739AC0A-0937-46D7-8807-1EE95CEB576D} - EndGlobalSection -EndGlobal diff --git a/library/win32/TracyProfiler.vcxproj b/library/win32/TracyProfiler.vcxproj deleted file mode 100644 index aee58cb1..00000000 --- a/library/win32/TracyProfiler.vcxproj +++ /dev/null @@ -1,229 +0,0 @@ - - - - - Debug - Win32 - - - ReleaseOnDemand - Win32 - - - ReleaseOnDemand - x64 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - - - - 16.0 - {C5B825D3-F140-45AB-8A47-B740E56631FB} - Win32Proj - TracyProfiler - 10.0 - - - - DynamicLibrary - true - v143 - Unicode - - - DynamicLibrary - false - v143 - true - Unicode - - - DynamicLibrary - false - v143 - true - Unicode - - - DynamicLibrary - true - v143 - Unicode - - - DynamicLibrary - false - v143 - true - Unicode - - - DynamicLibrary - false - v143 - true - Unicode - - - - - - - - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - false - - - false - - - - Use - Level3 - true - WIN32;_DEBUG;TRACY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - pch.h - - - Windows - true - false - - - - - Use - Level3 - true - _DEBUG;TRACY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - pch.h - - - Windows - true - false - - - - - Use - Level3 - true - true - true - WIN32;NDEBUG;TRACY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - pch.h - - - Windows - true - true - true - false - - - - - Use - Level3 - true - true - true - WIN32;NDEBUG;TRACY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - pch.h - - - Windows - true - true - true - false - - - - - NotUsing - Level3 - true - true - true - TRACY_ENABLE;NDEBUG;TRACY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - false - - - - - NotUsing - Level3 - true - true - true - TRACY_ON_DEMAND;TRACY_ENABLE;NDEBUG;TRACY_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - true - - - Windows - true - true - true - false - - - - - - \ No newline at end of file diff --git a/library/win32/TracyProfiler.vcxproj.filters b/library/win32/TracyProfiler.vcxproj.filters deleted file mode 100644 index 12862807..00000000 --- a/library/win32/TracyProfiler.vcxproj.filters +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/manual/tracy.tex b/manual/tracy.tex index be929ee0..0946692f 100644 --- a/manual/tracy.tex +++ b/manual/tracy.tex @@ -553,7 +553,7 @@ By default, the Tracy client will listen on IPv6 interfaces, falling back to IPv Things are a bit different in projects that consist of multiple DLLs/shared objects. Compiling \texttt{TracyClient.cpp} into every DLL is not an option because this would result in several instances of Tracy objects lying around in the process. We instead need to pass their instances to the different DLLs to be reused there. -For that, you need a \emph{profiler DLL} to which your executable and the other DLLs link. If that doesn't exist, you have to create one explicitly for Tracy\footnote{You may also look at the \texttt{library} directory in the profiler source tree.}. This library should contain the \texttt{public/TracyClient.cpp} source file. Link the executable and all DLLs you want to profile to this DLL. +For that, you need a \emph{profiler DLL} to which your executable and the other DLLs link. If that doesn't exist, you have to create one explicitly for Tracy\footnote{You can use the top-level Meson or CMake build scripts to get it. Make sure that the same build flags are set for both the library and your application, or you may find yourself chasing weird issues.}. This library should contain the \texttt{public/TracyClient.cpp} source file. Link the executable and all DLLs you want to profile to this DLL. If you are targeting Windows with Microsoft Visual Studio or MinGW, add the \texttt{TRACY\_IMPORTS} define to your application.