From 3c5381fe0f8d5fc531c90b1e2b63143b86a84777 Mon Sep 17 00:00:00 2001 From: _xeroxz Date: Fri, 21 May 2021 23:30:19 -0700 Subject: [PATCH] fixed zydis includes which were causing crashes... --- dependencies/vmprofiler | 2 +- src/vmprofiler-qt.vcxproj | 89 +++++++------- src/vmprofiler-qt.vcxproj.filters | 195 +++++++++++++++--------------- 3 files changed, 141 insertions(+), 145 deletions(-) diff --git a/dependencies/vmprofiler b/dependencies/vmprofiler index a05293a..90d0c06 160000 --- a/dependencies/vmprofiler +++ b/dependencies/vmprofiler @@ -1 +1 @@ -Subproject commit a05293ab21c93c024792a8064a8344241b947f81 +Subproject commit 90d0c0642656f86d3ec3f9736d09b8558d0f930c diff --git a/src/vmprofiler-qt.vcxproj b/src/vmprofiler-qt.vcxproj index c7efcae..9d88cc8 100644 --- a/src/vmprofiler-qt.vcxproj +++ b/src/vmprofiler-qt.vcxproj @@ -58,7 +58,7 @@ $(VC_IncludePath);$(WindowsSDK_IncludePath);;$(ProjectDir)..\dependencies\vmprofiler\include - G:\Qt\5.15.1\msvc2019_64\include;$(ProjectDir);$(ProjectDir)DarkStyle\framelesswindow\;$(ProjectDir)DarkStyle;$(IncludePath);$(ProjectDir)..\dependencies\vmprofiler\include + G:\Qt\5.15.1\msvc2019_64\include;$(ProjectDir);$(ProjectDir)DarkStyle\framelesswindow\;$(ProjectDir)DarkStyle;$(IncludePath);$(ProjectDir)..\dependencies\vmprofiler\include;$(ProjectDir)..\dependencies\vmprofiler\dependencies\zydis\include;$(ProjectDir)..\dependencies\vmprofiler\dependencies\zydis\dependencies\zycore\include;$(ProjectDir)..\dependencies\vmprofiler\dependencies\zydis\msvc @@ -111,56 +111,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/vmprofiler-qt.vcxproj.filters b/src/vmprofiler-qt.vcxproj.filters index 42b4caf..378cf16 100644 --- a/src/vmprofiler-qt.vcxproj.filters +++ b/src/vmprofiler-qt.vcxproj.filters @@ -42,20 +42,20 @@ {5f579aad-1e93-4542-9e34-7f59aaee46da} - - {b0071ba0-39c0-4018-8575-29ae093557cb} + + {da03ed08-340b-423c-875d-1167c5575937} - - {eb951f82-57a0-4854-bd37-1d837c3b55f5} + + {372a780d-f944-4786-acbf-e6741e5caf7a} - - {ee615592-4e69-4d91-9a33-bd1ef26cc6a2} + + {fa365433-05db-4072-b63d-493cca4f1ca7} - - {936bd042-ae18-4c6e-96d4-702a4e9a323d} + + {b4f5c8c6-4ab4-4034-96e6-c011a1eeb0cf} - - {b53c22d7-ea35-4fce-96e0-5a53971607c7} + + {6a0de737-6e61-4611-a035-82c1aff09648} @@ -113,137 +113,134 @@ Header Files\vmprofiler - - Header Files\vmprofiler - - - Header Files\vmprofiler + + Header Files\Zydis - - Header Files\vmprofiler\Zydis + + Header Files\Zydis - - Header Files\vmprofiler\Zydis + + Header Files\Zydis - - Header Files\vmprofiler\Zydis + + Header Files\Zydis - - Header Files\vmprofiler\Zydis + + Header Files\Zydis - - Header Files\vmprofiler\Zydis + + Header Files\Zydis - - Header Files\vmprofiler\Zydis + + Header Files\Zydis - - Header Files\vmprofiler\Zydis + + Header Files\Zydis - - Header Files\vmprofiler\Zydis + + Header Files\Zydis - - Header Files\vmprofiler\Zydis + + Header Files\Zydis - - Header Files\vmprofiler\Zydis + + Header Files\Zydis - - Header Files\vmprofiler\Zydis + + Header Files\Zydis - - Header Files\vmprofiler\Zydis + + Header Files\Zydis\Internal - - Header Files\vmprofiler\Zydis\Generated + + Header Files\Zydis\Internal - - Header Files\vmprofiler\Zydis\Generated + + Header Files\Zydis\Internal - - Header Files\vmprofiler\Zydis\Generated + + Header Files\Zydis\Internal - - Header Files\vmprofiler\Zydis\Generated + + Header Files\Zydis\Internal - - Header Files\vmprofiler\Zydis\Generated + + Header Files\Zydis\Internal - - Header Files\vmprofiler\Zydis\Internal + + Header Files\Zydis\Generated - - Header Files\vmprofiler\Zydis\Internal + + Header Files\Zydis\Generated - - Header Files\vmprofiler\Zydis\Internal + + Header Files\Zydis\Generated - - Header Files\vmprofiler\Zydis\Internal + + Header Files\Zydis\Generated - - Header Files\vmprofiler\Zydis\Internal + + Header Files\Zydis\Generated - - Header Files\vmprofiler\Zydis\Internal + + Header Files\Zycore\API - - Header Files\vmprofiler\Zycore + + Header Files\Zycore\API - - Header Files\vmprofiler\Zycore + + Header Files\Zycore\API - - Header Files\vmprofiler\Zycore + + Header Files\Zycore\API - - Header Files\vmprofiler\Zycore + + Header Files\Zycore - - Header Files\vmprofiler\Zycore + + Header Files\Zycore - - Header Files\vmprofiler\Zycore + + Header Files\Zycore - - Header Files\vmprofiler\Zycore + + Header Files\Zycore - - Header Files\vmprofiler\Zycore + + Header Files\Zycore - - Header Files\vmprofiler\Zycore + + Header Files\Zycore - - Header Files\vmprofiler\Zycore + + Header Files\Zycore - - Header Files\vmprofiler\Zycore + + Header Files\Zycore - - Header Files\vmprofiler\Zycore + + Header Files\Zycore - - Header Files\vmprofiler\Zycore + + Header Files\Zycore - - Header Files\vmprofiler\Zycore + + Header Files\Zycore - - Header Files\vmprofiler\Zycore\API + + Header Files\Zycore - - Header Files\vmprofiler\Zycore\API + + Header Files\Zycore - - Header Files\vmprofiler\Zycore\API + + Header Files\Zycore - - Header Files\vmprofiler\Zycore\API + + Header Files - - Header Files\vmprofiler\Zycore\API + + Header Files