From be34e5076c2c22638a8bf8f290b2b3366efb3337 Mon Sep 17 00:00:00 2001 From: kubouch Date: Sat, 11 Jul 2020 15:48:08 +0300 Subject: [PATCH] Add Windows build for csvexport Copy-pasted files from capture utility and adapted for csvexport --- csvexport/build/win32/csvexport.sln | 31 ++ csvexport/build/win32/csvexport.vcxproj | 273 +++++++++++++--- .../build/win32/csvexport.vcxproj.filters | 300 ++++++++++++++++++ csvexport/src/csvexport.cpp | 14 +- 4 files changed, 579 insertions(+), 39 deletions(-) create mode 100644 csvexport/build/win32/csvexport.sln create mode 100644 csvexport/build/win32/csvexport.vcxproj.filters diff --git a/csvexport/build/win32/csvexport.sln b/csvexport/build/win32/csvexport.sln new file mode 100644 index 00000000..41975ed3 --- /dev/null +++ b/csvexport/build/win32/csvexport.sln @@ -0,0 +1,31 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.30225.117 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "csvexport", "csvexport.vcxproj", "{447D58BF-94CD-4469-BB90-549C05D03E00}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|x64 = Release|x64 + Release|x86 = Release|x86 + 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}.Debug|x86.ActiveCfg = Debug|Win32 + {447D58BF-94CD-4469-BB90-549C05D03E00}.Debug|x86.Build.0 = Debug|Win32 + {447D58BF-94CD-4469-BB90-549C05D03E00}.Release|x64.ActiveCfg = Release|x64 + {447D58BF-94CD-4469-BB90-549C05D03E00}.Release|x64.Build.0 = Release|x64 + {447D58BF-94CD-4469-BB90-549C05D03E00}.Release|x86.ActiveCfg = Release|Win32 + {447D58BF-94CD-4469-BB90-549C05D03E00}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {3E51386C-43EA-44AC-9F24-AFAFE4D63ADE} + EndGlobalSection +EndGlobal diff --git a/csvexport/build/win32/csvexport.vcxproj b/csvexport/build/win32/csvexport.vcxproj index c9c44d42..b350fe5e 100644 --- a/csvexport/build/win32/csvexport.vcxproj +++ b/csvexport/build/win32/csvexport.vcxproj @@ -1,38 +1,235 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {447D58BF-94CD-4469-BB90-549C05D03E00} + capture + 10.0 + x64-windows-static + + + + Application + true + v142 + MultiByte + + + Application + false + v142 + true + MultiByte + + + Application + true + v142 + MultiByte + + + Application + false + v142 + true + MultiByte + + + + + + + + + + + + + + + + + + + + + + + Level3 + Disabled + true + true + + + + + Level3 + Disabled + true + true + true + _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;capstone.lib;%(AdditionalDependencies) + Console + ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\debug\lib + + + + + Level3 + MaxSpeed + true + true + true + true + + + true + true + + + + + Level3 + MaxSpeed + true + true + true + true + true + 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;capstone.lib;%(AdditionalDependencies) + Console + ..\..\..\vcpkg\vcpkg\installed\x64-windows-static\lib + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/csvexport/build/win32/csvexport.vcxproj.filters b/csvexport/build/win32/csvexport.vcxproj.filters new file mode 100644 index 00000000..045ffe8b --- /dev/null +++ b/csvexport/build/win32/csvexport.vcxproj.filters @@ -0,0 +1,300 @@ + + + + + {729c80ee-4d26-4a5e-8f1f-6c075783eb56} + + + {cf23ef7b-7694-4154-830b-00cf053350ea} + + + {e39d3623-47cd-4752-8da9-3ea324f964c1} + + + {043ecb94-f240-4986-94b0-bc5bbd415a82} + + + {ee9737d2-69c7-44da-b9c7-539d18f9d4b4} + + + + + common + + + common + + + common + + + server + + + server + + + common + + + server + + + server + + + server + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + server + + + server + + + getopt + + + src + + + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + common + + + server + + + server + + + server + + + server + + + server + + + server + + + server + + + server + + + common + + + common + + + server + + + server + + + server + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + zstd + + + server + + + server + + + server + + + getopt + + + \ No newline at end of file diff --git a/csvexport/src/csvexport.cpp b/csvexport/src/csvexport.cpp index 9b276609..c0654c44 100644 --- a/csvexport/src/csvexport.cpp +++ b/csvexport/src/csvexport.cpp @@ -1,3 +1,7 @@ +#ifdef _WIN32 +# include +#endif + #include #include #include @@ -11,7 +15,7 @@ #include "../../server/TracyFileRead.hpp" #include "../../server/TracyWorker.hpp" -#include "getopt.h" +#include "../../getopt/getopt.h" void print_usage_exit(int e) { @@ -173,6 +177,14 @@ int64_t GetZoneChildTimeFast( int main(int argc, char** argv) { +#ifdef _WIN32 + if (!AttachConsole(ATTACH_PARENT_PROCESS)) + { + AllocConsole(); + SetConsoleMode(GetStdHandle(STD_OUTPUT_HANDLE), 0x07); + } +#endif + Args args = parse_args(argc, argv); auto f = std::unique_ptr(