diff options
| author | MACHIZAUD Andréa <andrea.machizaud@gmail.com> | 2022-04-08 00:27:18 +0300 |
|---|---|---|
| committer | MACHIZAUD Andréa <andrea.machizaud@gmail.com> | 2022-05-09 11:42:10 +0300 |
| commit | adcfe4df35a44ebfec85faf894bed60ea401f4b0 (patch) | |
| tree | 3520a5cbdc78ff604690b0eebd4a10169cdc4936 | |
| parent | 0a432ed349c22a3adf25f779dd53791acff6eaa0 (diff) | |
Add Vcpkg manifest + MSBuild integration
| -rw-r--r-- | .github/workflows/msvc.yml | 2 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | capture/build/win32/capture.vcxproj | 3 | ||||
| -rw-r--r-- | csvexport/build/win32/csvexport.vcxproj | 3 | ||||
| -rw-r--r-- | import-chrome/build/win32/import-chrome.vcxproj | 3 | ||||
| -rw-r--r-- | profiler/build/win32/Tracy.vcxproj | 3 | ||||
| -rw-r--r-- | update/build/win32/update.vcxproj | 3 | ||||
| -rw-r--r-- | vcpkg.json | 13 |
8 files changed, 29 insertions, 2 deletions
diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml index 3ed09fb9..89aca044 100644 --- a/.github/workflows/msvc.yml +++ b/.github/workflows/msvc.yml @@ -16,8 +16,6 @@ jobs: - uses: microsoft/setup-msbuild@v1.0.2 - name: Integrate vcpkg run: vcpkg integrate install - - name: Build vcpkg libraries - run: vcpkg install freetype glfw3 capstone[arm,arm64,x86] --triplet x64-windows-static - name: Profiler GUI Debug run: msbuild .\profiler\build\win32\Tracy.vcxproj /property:Configuration=Debug /property:Platform=x64 - name: Profiler GUI Release @@ -29,6 +29,7 @@ profiler/build/win32/Tracy.aps # include the vcpkg install script but not the files it produces vcpkg/* !vcpkg/install_vcpkg_dependencies.bat +/vcpkg_installed .deps/ .dirstamp .vscode/ diff --git a/capture/build/win32/capture.vcxproj b/capture/build/win32/capture.vcxproj index 569b3214..c4d4616f 100644 --- a/capture/build/win32/capture.vcxproj +++ b/capture/build/win32/capture.vcxproj @@ -44,6 +44,9 @@ </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup /> + <PropertyGroup Label="Vcpkg"> + <VcpkgEnableManifest>true</VcpkgEnableManifest> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <WarningLevel>Level3</WarningLevel> diff --git a/csvexport/build/win32/csvexport.vcxproj b/csvexport/build/win32/csvexport.vcxproj index f5457414..49b974a4 100644 --- a/csvexport/build/win32/csvexport.vcxproj +++ b/csvexport/build/win32/csvexport.vcxproj @@ -44,6 +44,9 @@ </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup /> + <PropertyGroup Label="Vcpkg"> + <VcpkgEnableManifest>true</VcpkgEnableManifest> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <WarningLevel>Level3</WarningLevel> diff --git a/import-chrome/build/win32/import-chrome.vcxproj b/import-chrome/build/win32/import-chrome.vcxproj index 8a7758ab..b8cf7c74 100644 --- a/import-chrome/build/win32/import-chrome.vcxproj +++ b/import-chrome/build/win32/import-chrome.vcxproj @@ -44,6 +44,9 @@ </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup /> + <PropertyGroup Label="Vcpkg"> + <VcpkgEnableManifest>true</VcpkgEnableManifest> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <WarningLevel>Level3</WarningLevel> diff --git a/profiler/build/win32/Tracy.vcxproj b/profiler/build/win32/Tracy.vcxproj index ceeaee4d..29697588 100644 --- a/profiler/build/win32/Tracy.vcxproj +++ b/profiler/build/win32/Tracy.vcxproj @@ -51,6 +51,9 @@ <Linkage-freetype>static</Linkage-freetype> <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary> </PropertyGroup> + <PropertyGroup Label="Vcpkg"> + <VcpkgEnableManifest>true</VcpkgEnableManifest> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <WarningLevel>Level3</WarningLevel> diff --git a/update/build/win32/update.vcxproj b/update/build/win32/update.vcxproj index 0091ba47..9c6d8651 100644 --- a/update/build/win32/update.vcxproj +++ b/update/build/win32/update.vcxproj @@ -44,6 +44,9 @@ </ImportGroup> <PropertyGroup Label="UserMacros" /> <PropertyGroup /> + <PropertyGroup Label="Vcpkg"> + <VcpkgEnableManifest>true</VcpkgEnableManifest> + </PropertyGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <WarningLevel>Level3</WarningLevel> diff --git a/vcpkg.json b/vcpkg.json new file mode 100644 index 00000000..b4109e3a --- /dev/null +++ b/vcpkg.json @@ -0,0 +1,13 @@ +{ + "$schema": "https://raw.githubusercontent.com/microsoft/vcpkg/master/scripts/vcpkg.schema.json", + "name": "tracy", + "version-semver": "0.8.0", + "description": "C++ frame profiler", + "homepage": "https://github.com/wolfpld/tracy", + "builtin-baseline": "af2287382b1991dbdcb7e5112d236f3323b9dd7a", + "dependencies": [ + { "name": "capstone", "features":[ "arm", "arm64", "x86" ] }, + "freetype", + "glfw3" + ] +} |