diff --git a/.gitignore b/.gitignore index 48c593da..dcec2473 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,7 @@ manual/t*.synctex.gz manual/t*.toc profiler/build/win32/packages profiler/build/win32/Tracy.aps + +# include the vcpkg install script but not the files it produces +vcpkg/* +!vcpkg/install_vcpkg_dependencies.bat diff --git a/capture/build/win32/capture.vcxproj b/capture/build/win32/capture.vcxproj index d0d59fd2..ffea25c1 100644 --- a/capture/build/win32/capture.vcxproj +++ b/capture/build/win32/capture.vcxproj @@ -89,10 +89,12 @@ TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest + ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include - ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console + ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\debug\lib @@ -121,12 +123,14 @@ TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest + ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include true true - ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console + ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\lib diff --git a/import-chrome/build/win32/import-chrome.vcxproj b/import-chrome/build/win32/import-chrome.vcxproj index 009f03e9..a6a5167c 100644 --- a/import-chrome/build/win32/import-chrome.vcxproj +++ b/import-chrome/build/win32/import-chrome.vcxproj @@ -89,10 +89,12 @@ TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest + ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include - ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console + ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\debug\lib @@ -121,12 +123,14 @@ TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest + ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include true true - ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console + ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\lib diff --git a/manual/tracy.tex b/manual/tracy.tex index ebf0ec1f..a8545bbc 100644 --- a/manual/tracy.tex +++ b/manual/tracy.tex @@ -574,12 +574,22 @@ To build the application contained in the \texttt{profiler} directory, you will \paragraph{Windows} -On Windows you will need to use the \texttt{vcpkg} utility, which will automatically download and build the required files. If you are not familiar with this tool, please read the description at the following address: \url{https://docs.microsoft.com/en-us/cpp/build/vcpkg}. Please follow the installation instructions, then execute the following commands: +On Windows you will need to use the \texttt{vcpkg} utility. If you are not familiar with this tool, please read the description at the following address: \url{https://docs.microsoft.com/en-us/cpp/build/vcpkg}. +There are two ways you can run \texttt{vcpkg} to install the dependencies for Tracy: + +\begin{itemize} +\item \texttt{STANDALONE} -- run this script to download and build both \texttt{vcpkg} and the required dependencies: +\begin{lstlisting}[language=sh] +tracy\vcpkg\install_vcpkg_dependencies.bat +\end{lstlisting} +This writes files only to the \texttt{tracy\textbackslash{}vcpkg\textbackslash{}vcpkg} directory and makes no other changes on your machine. +\item \texttt{SEPARATE} -- install \texttt{vcpkg} by following the instructions on its website, and then execute the following commands: \begin{lstlisting}[language=sh] vcpkg integrate install vcpkg install --triplet x64-windows-static freetype glfw3 capstone[arm,arm64,x86] \end{lstlisting} +\end{itemize} \paragraph{Unix} diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj index d84fa9ea..4d25bd24 100644 --- a/profiler/build/win32/Tracy.vcxproj +++ b/profiler/build/win32/Tracy.vcxproj @@ -57,7 +57,7 @@ Disabled true _CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) - ..\..\libs\gl3w;..\..\..\imgui;%(AdditionalIncludeDirectories) + ..\..\libs\gl3w;..\..\..\imgui;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include;%(AdditionalIncludeDirectories) true false true @@ -67,8 +67,9 @@ Fast - ws2_32.lib;opengl32.lib;%(AdditionalDependencies) + ws2_32.lib;opengl32.lib;freetyped.lib;glfw3.lib;libpng16d.lib;zlibd.lib;bz2d.lib;capstone.lib;%(AdditionalDependencies) Windows + ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\debug\lib true @@ -82,7 +83,7 @@ true true NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) - ..\..\libs\gl3w;..\..\..\imgui;%(AdditionalIncludeDirectories) + ..\..\libs\gl3w;..\..\..\imgui;..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include;%(AdditionalIncludeDirectories) true true AdvancedVectorExtensions2 @@ -93,8 +94,9 @@ true true - ws2_32.lib;opengl32.lib;%(AdditionalDependencies) + ws2_32.lib;opengl32.lib;freetype.lib;glfw3.lib;libpng16.lib;zlib.lib;bz2.lib;capstone.lib;%(AdditionalDependencies) Windows + ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\lib true diff --git a/update/build/win32/update.vcxproj b/update/build/win32/update.vcxproj index 739835a0..46ed6aa9 100644 --- a/update/build/win32/update.vcxproj +++ b/update/build/win32/update.vcxproj @@ -89,10 +89,12 @@ TRACY_NO_STATISTICS;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest + ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include - ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console + ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\debug\lib @@ -121,12 +123,14 @@ TRACY_NO_STATISTICS;NDEBUG;_CRT_SECURE_NO_DEPRECATE;_CRT_NONSTDC_NO_DEPRECATE;WIN32_LEAN_AND_MEAN;NOMINMAX;_USE_MATH_DEFINES;%(PreprocessorDefinitions) AdvancedVectorExtensions2 stdcpplatest + ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\include true true - ws2_32.lib;%(AdditionalDependencies) + ws2_32.lib;capstone.lib;%(AdditionalDependencies) Console + ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\lib diff --git a/vcpkg/install_vcpkg_dependencies.bat b/vcpkg/install_vcpkg_dependencies.bat new file mode 100644 index 00000000..089c389c --- /dev/null +++ b/vcpkg/install_vcpkg_dependencies.bat @@ -0,0 +1,10 @@ +@echo off + +REM get vcpkg distribution +if not exist vcpkg git clone https://github.com/Microsoft/vcpkg.git + +REM build vcpkg +if not exist vcpkg\vcpkg.exe call vcpkg\bootstrap-vcpkg.bat + +REM install required packages +vcpkg\vcpkg.exe install --triplet x64-windows-static freetype glfw3 capstone[arm,arm64,x86]