From 2a96079ba54a905d29afb3834182cbf06eff9132 Mon Sep 17 00:00:00 2001 From: Zac Walker Date: Fri, 24 Jun 2022 15:01:46 +0200 Subject: [PATCH 1/5] Windows ARM64 support --- Main/StackWalker/.gitignore | 1 + Main/StackWalker/StackWalker.cpp | 8 + Main/StackWalker/StackWalker_VC2022.sln | 54 ++ Main/StackWalker/StackWalker_VC2022.vcxproj | 517 ++++++++++++++++++ .../StackWalker_VC2022.vcxproj.filters | 30 + .../StackWalker_VC2022.vcxproj.vspscc | 10 + Main/StackWalker/main.cpp | 11 +- 7 files changed, 628 insertions(+), 3 deletions(-) create mode 100644 Main/StackWalker/StackWalker_VC2022.sln create mode 100644 Main/StackWalker/StackWalker_VC2022.vcxproj create mode 100644 Main/StackWalker/StackWalker_VC2022.vcxproj.filters create mode 100644 Main/StackWalker/StackWalker_VC2022.vcxproj.vspscc diff --git a/Main/StackWalker/.gitignore b/Main/StackWalker/.gitignore index 6137aaa..8946dc8 100644 --- a/Main/StackWalker/.gitignore +++ b/Main/StackWalker/.gitignore @@ -5,6 +5,7 @@ /Debug_* /Release_* /x64 +/arm64 /Itanium /ipch /.vs diff --git a/Main/StackWalker/StackWalker.cpp b/Main/StackWalker/StackWalker.cpp index 64c0df0..8bc5459 100644 --- a/Main/StackWalker/StackWalker.cpp +++ b/Main/StackWalker/StackWalker.cpp @@ -1190,6 +1190,14 @@ BOOL StackWalker::ShowCallstack(HANDLE hThread, s.AddrBStore.Mode = AddrModeFlat; s.AddrStack.Offset = c.IntSp; s.AddrStack.Mode = AddrModeFlat; +#elif _M_ARM64 + imageType = IMAGE_FILE_MACHINE_ARM64; + s.AddrPC.Offset = c.Pc; + s.AddrPC.Mode = AddrModeFlat; + s.AddrFrame.Offset = c.Fp; + s.AddrFrame.Mode = AddrModeFlat; + s.AddrStack.Offset = c.Sp; + s.AddrStack.Mode = AddrModeFlat; #else #error "Platform not supported!" #endif diff --git a/Main/StackWalker/StackWalker_VC2022.sln b/Main/StackWalker/StackWalker_VC2022.sln new file mode 100644 index 0000000..023bdce --- /dev/null +++ b/Main/StackWalker/StackWalker_VC2022.sln @@ -0,0 +1,54 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 17 +VisualStudioVersion = 17.3.32620.295 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StackWalker_VC2022", "StackWalker_VC2022.vcxproj", "{89B2BD42-B130-4811-9043-71A8EBC40DE5}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug_VC2017|ARM64 = Debug_VC2017|ARM64 + Debug_VC2017|Win32 = Debug_VC2017|Win32 + Debug_VC2017|x64 = Debug_VC2017|x64 + Debug_VC2017-UNICODE|ARM64 = Debug_VC2017-UNICODE|ARM64 + Debug_VC2017-UNICODE|Win32 = Debug_VC2017-UNICODE|Win32 + Debug_VC2017-UNICODE|x64 = Debug_VC2017-UNICODE|x64 + Release_VC2017|ARM64 = Release_VC2017|ARM64 + Release_VC2017|Win32 = Release_VC2017|Win32 + Release_VC2017|x64 = Release_VC2017|x64 + Release_VC2017-UNICODE|ARM64 = Release_VC2017-UNICODE|ARM64 + Release_VC2017-UNICODE|Win32 = Release_VC2017-UNICODE|Win32 + Release_VC2017-UNICODE|x64 = Release_VC2017-UNICODE|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Debug_VC2017|ARM64.ActiveCfg = Debug_VC2017|ARM64 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Debug_VC2017|ARM64.Build.0 = Debug_VC2017|ARM64 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Debug_VC2017|Win32.ActiveCfg = Debug_VC2017|Win32 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Debug_VC2017|Win32.Build.0 = Debug_VC2017|Win32 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Debug_VC2017|x64.ActiveCfg = Debug_VC2017|x64 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Debug_VC2017|x64.Build.0 = Debug_VC2017|x64 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Debug_VC2017-UNICODE|ARM64.ActiveCfg = Debug_VC2017-UNICODE|ARM64 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Debug_VC2017-UNICODE|ARM64.Build.0 = Debug_VC2017-UNICODE|ARM64 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Debug_VC2017-UNICODE|Win32.ActiveCfg = Debug_VC2017-UNICODE|Win32 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Debug_VC2017-UNICODE|Win32.Build.0 = Debug_VC2017-UNICODE|Win32 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Debug_VC2017-UNICODE|x64.ActiveCfg = Debug_VC2017-UNICODE|x64 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Debug_VC2017-UNICODE|x64.Build.0 = Debug_VC2017-UNICODE|x64 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Release_VC2017|ARM64.ActiveCfg = Release_VC2017|ARM64 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Release_VC2017|ARM64.Build.0 = Release_VC2017|ARM64 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Release_VC2017|Win32.ActiveCfg = Release_VC2017|Win32 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Release_VC2017|Win32.Build.0 = Release_VC2017|Win32 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Release_VC2017|x64.ActiveCfg = Release_VC2017|x64 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Release_VC2017|x64.Build.0 = Release_VC2017|x64 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Release_VC2017-UNICODE|ARM64.ActiveCfg = Release_VC2017-UNICODE|ARM64 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Release_VC2017-UNICODE|ARM64.Build.0 = Release_VC2017-UNICODE|ARM64 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Release_VC2017-UNICODE|Win32.ActiveCfg = Release_VC2017-UNICODE|Win32 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Release_VC2017-UNICODE|Win32.Build.0 = Release_VC2017-UNICODE|Win32 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Release_VC2017-UNICODE|x64.ActiveCfg = Release_VC2017-UNICODE|x64 + {89B2BD42-B130-4811-9043-71A8EBC40DE5}.Release_VC2017-UNICODE|x64.Build.0 = Release_VC2017-UNICODE|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {214F4088-66CE-43FA-80E8-33674E8CE048} + EndGlobalSection +EndGlobal diff --git a/Main/StackWalker/StackWalker_VC2022.vcxproj b/Main/StackWalker/StackWalker_VC2022.vcxproj new file mode 100644 index 0000000..07a4dc0 --- /dev/null +++ b/Main/StackWalker/StackWalker_VC2022.vcxproj @@ -0,0 +1,517 @@ + + + + + Debug_VC2017-UNICODE + ARM64 + + + Debug_VC2017-UNICODE + Win32 + + + Debug_VC2017-UNICODE + x64 + + + Debug_VC2017 + ARM64 + + + Debug_VC2017 + Win32 + + + Debug_VC2017 + x64 + + + Release_VC2017-UNICODE + ARM64 + + + Release_VC2017-UNICODE + Win32 + + + Release_VC2017-UNICODE + x64 + + + Release_VC2017 + ARM64 + + + Release_VC2017 + Win32 + + + Release_VC2017 + x64 + + + + {89B2BD42-B130-4811-9043-71A8EBC40DE5} + StackWalker_VC2017 + + + + + + + + + Win32Proj + 10.0 + + + + Application + Unicode + v143 + + + Application + Unicode + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + Unicode + v143 + + + Application + Unicode + v143 + + + Application + Unicode + v143 + + + Application + Unicode + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + <_ProjectFileVersion>10.0.30319.1 + $(Configuration)\ + $(Configuration)\ + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + true + $(Configuration)\ + $(Configuration)\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + false + $(Configuration)\ + $(Configuration)\ + true + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + true + true + $(Configuration)\ + $(Configuration)\ + false + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ + false + false + AllRules.ruleset + + + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + + + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + + + AllRules.ruleset + AllRules.ruleset + + + + + AllRules.ruleset + + + AllRules.ruleset + AllRules.ruleset + + + + + + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + + + true + $(OutDir)StackWalker.pdb + Console + false + + + MachineX86 + + + + + X64 + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + true + $(OutDir)StackWalker.pdb + Console + false + + + MachineX64 + + + + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + true + $(OutDir)StackWalker.pdb + Console + true + + + + + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + true + Console + true + true + false + + + MachineX86 + + + + + X64 + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + true + Console + true + true + false + + + MachineX64 + + + + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + true + Console + true + true + true + + + + + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + EditAndContinue + + + true + $(OutDir)StackWalker.pdb + Console + false + + + MachineX86 + + + + + X64 + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + true + $(OutDir)StackWalker.pdb + Console + false + + + MachineX64 + + + + + + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + + + Level3 + ProgramDatabase + + + true + $(OutDir)StackWalker.pdb + Console + true + + + + + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + true + Console + true + true + false + + + MachineX86 + + + + + X64 + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + true + Console + true + true + false + + + MachineX64 + + + + + + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + MultiThreaded + + + Level3 + ProgramDatabase + + + true + Console + true + true + true + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Main/StackWalker/StackWalker_VC2022.vcxproj.filters b/Main/StackWalker/StackWalker_VC2022.vcxproj.filters new file mode 100644 index 0000000..bba4539 --- /dev/null +++ b/Main/StackWalker/StackWalker_VC2022.vcxproj.filters @@ -0,0 +1,30 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hpp;hxx;hm;inl;inc;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx + + + + + Source Files + + + Source Files + + + + + Header Files + + + \ No newline at end of file diff --git a/Main/StackWalker/StackWalker_VC2022.vcxproj.vspscc b/Main/StackWalker/StackWalker_VC2022.vcxproj.vspscc new file mode 100644 index 0000000..6cb031b --- /dev/null +++ b/Main/StackWalker/StackWalker_VC2022.vcxproj.vspscc @@ -0,0 +1,10 @@ +"" +{ +"FILE_VERSION" = "9237" +"ENLISTMENT_CHOICE" = "NEVER" +"PROJECT_FILE_RELATIVE_PATH" = "" +"NUMBER_OF_EXCLUDED_FILES" = "0" +"ORIGINAL_PROJECT_FILE_PATH" = "" +"NUMBER_OF_NESTED_PROJECTS" = "0" +"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROJECT" +} diff --git a/Main/StackWalker/main.cpp b/Main/StackWalker/main.cpp index 2db23c6..b137904 100644 --- a/Main/StackWalker/main.cpp +++ b/Main/StackWalker/main.cpp @@ -85,7 +85,7 @@ void GlobalFunctionPointerTest() // http://blog.kalmbach-software.de/2008/04/02/unhandled-exceptions-in-vc8-and-above-for-x86-and-x64/ // Even better: http://blog.kalmbach-software.de/2013/05/23/improvedpreventsetunhandledexceptionfilter/ -#if defined(_M_X64) || defined(_M_IX86) +#if defined(_M_X64) || defined(_M_IX86) || defined(_M_ARM64) static BOOL PreventSetUnhandledExceptionFilter() { HMODULE hKernel32 = LoadLibrary(_T("kernel32.dll")); @@ -104,6 +104,11 @@ static BOOL PreventSetUnhandledExceptionFilter() // 33 C0 xor eax,eax // C3 ret unsigned char szExecute[] = {0x33, 0xC0, 0xC3}; +#elif _M_ARM64 + unsigned char szExecute[] = { + 0x00, 0x00, 0x80, 0x52, // mov w0, #0 + 0xC0, 0x03, 0x5F, 0xD6 // ret + }; #else #error "The following code only works for x86 and x64!" #endif @@ -123,7 +128,7 @@ static BOOL PreventSetUnhandledExceptionFilter() return bRet; } #else -#pragma message("This code works only for x86 and x64!") +#pragma message("This code works only for x86, x64 and arm64!") #endif static TCHAR s_szExceptionLogFileName[_MAX_PATH] = _T("\\exceptions.log"); // default @@ -174,7 +179,7 @@ static void InitUnhandledExceptionFilter() { // set global exception handler (for handling all unhandled exceptions) SetUnhandledExceptionFilter(CrashHandlerExceptionFilter); -#if defined _M_X64 || defined _M_IX86 +#if defined _M_X64 || defined _M_IX86 || defined _M_ARM64 PreventSetUnhandledExceptionFilter(); #endif s_bUnhandledExeptionFilterSet = TRUE; From 0f676d8fcc9da0575d304a6a0ed751c187aade0b Mon Sep 17 00:00:00 2001 From: Zac Walker Date: Tue, 28 Jun 2022 13:53:33 +0200 Subject: [PATCH 2/5] Testing adding ARM64 target --- appveyor.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 33a15f6..dbbe6be 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -22,6 +22,16 @@ environment: CMAKE_GENERATOR: "Visual Studio 15 2017" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 CMAKE_GENERATOR: "Visual Studio 15 2017 Win64" + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 + CMAKE_GENERATOR: "Visual Studio 17 2022" + TARGET: "-A Win32" + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 + CMAKE_GENERATOR: "Visual Studio 17 2022" + TARGET: "-A x64" + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 + CMAKE_GENERATOR: "Visual Studio 17 2022" + TARGET: "-A ARM64" + before_build: - if [%BUILDER%]==[msbuild] echo MSVC2008 @@ -55,6 +65,6 @@ build_script: - if [%BUILDER%]==[msbuild] msbuild %SLN_NAME% %MS_BLD_ARGS% /logger:"%AVLOGGER%" - if not [%BUILDER%]==[msbuild] cmake --version - if not [%BUILDER%]==[msbuild] cmake -E make_directory "build-dir" - - if not [%BUILDER%]==[msbuild] cmake -E chdir "build-dir" cmake -G "%CMAKE_GENERATOR%" --config RelWithDebInfo -DCMAKE_INSTALL_PREFIX="%APPVEYOR_BUILD_FOLDER%/root" .. + - if not [%BUILDER%]==[msbuild] cmake -E chdir "build-dir" cmake -G "%CMAKE_GENERATOR%" %%TARGET%% --config RelWithDebInfo -DCMAKE_INSTALL_PREFIX="%APPVEYOR_BUILD_FOLDER%/root" .. - if not [%BUILDER%]==[msbuild] cmake --build "build-dir" --config RelWithDebInfo - if not [%BUILDER%]==[msbuild] cmake --build "build-dir" --target install --config RelWithDebInfo From ee77eb66c6cad3ae531d998c669999ce6b4b603b Mon Sep 17 00:00:00 2001 From: Zac Walker Date: Tue, 28 Jun 2022 14:04:33 +0200 Subject: [PATCH 3/5] Testing adding ARM64 target 2 --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index dbbe6be..593064b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -65,6 +65,6 @@ build_script: - if [%BUILDER%]==[msbuild] msbuild %SLN_NAME% %MS_BLD_ARGS% /logger:"%AVLOGGER%" - if not [%BUILDER%]==[msbuild] cmake --version - if not [%BUILDER%]==[msbuild] cmake -E make_directory "build-dir" - - if not [%BUILDER%]==[msbuild] cmake -E chdir "build-dir" cmake -G "%CMAKE_GENERATOR%" %%TARGET%% --config RelWithDebInfo -DCMAKE_INSTALL_PREFIX="%APPVEYOR_BUILD_FOLDER%/root" .. + - if not [%BUILDER%]==[msbuild] cmake -E chdir "build-dir" cmake -G "%CMAKE_GENERATOR%" %TARGET% --config RelWithDebInfo -DCMAKE_INSTALL_PREFIX="%APPVEYOR_BUILD_FOLDER%/root" .. - if not [%BUILDER%]==[msbuild] cmake --build "build-dir" --config RelWithDebInfo - if not [%BUILDER%]==[msbuild] cmake --build "build-dir" --target install --config RelWithDebInfo From 77ec19961ef75c3711bd21c4640525d33332eee4 Mon Sep 17 00:00:00 2001 From: Zac Walker Date: Tue, 28 Jun 2022 14:21:25 +0200 Subject: [PATCH 4/5] Testing adding ARM64 target 3 --- appveyor.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 593064b..b6234c0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,24 +13,30 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 CMAKE_GENERATOR: "Visual Studio 12 2013" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 + TARGET_CONFIG: "--config RelWithDebInfo" CMAKE_GENERATOR: "Visual Studio 12 2013 Win64" + TARGET_CONFIG: "--config RelWithDebInfo" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 CMAKE_GENERATOR: "Visual Studio 14 2015" + TARGET_CONFIG: "--config RelWithDebInfo" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 CMAKE_GENERATOR: "Visual Studio 14 2015 Win64" + TARGET_CONFIG: "--config RelWithDebInfo" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 CMAKE_GENERATOR: "Visual Studio 15 2017" + TARGET_CONFIG: "--config RelWithDebInfo" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 CMAKE_GENERATOR: "Visual Studio 15 2017 Win64" + TARGET_CONFIG: "--config RelWithDebInfo" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 CMAKE_GENERATOR: "Visual Studio 17 2022" - TARGET: "-A Win32" + TARGET_ARCH: "-A Win32" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 CMAKE_GENERATOR: "Visual Studio 17 2022" - TARGET: "-A x64" + TARGET_ARCH: "-A x64" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 CMAKE_GENERATOR: "Visual Studio 17 2022" - TARGET: "-A ARM64" + TARGET_ARCH: "-A ARM64" before_build: @@ -65,6 +71,8 @@ build_script: - if [%BUILDER%]==[msbuild] msbuild %SLN_NAME% %MS_BLD_ARGS% /logger:"%AVLOGGER%" - if not [%BUILDER%]==[msbuild] cmake --version - if not [%BUILDER%]==[msbuild] cmake -E make_directory "build-dir" - - if not [%BUILDER%]==[msbuild] cmake -E chdir "build-dir" cmake -G "%CMAKE_GENERATOR%" %TARGET% --config RelWithDebInfo -DCMAKE_INSTALL_PREFIX="%APPVEYOR_BUILD_FOLDER%/root" .. + - if not [%BUILDER%]==[msbuild] cmake -E chdir "build-dir" cmake -G "%CMAKE_GENERATOR%" %TARGET_ARCH% %TARGET_CONFIG% -DCMAKE_INSTALL_PREFIX="%APPVEYOR_BUILD_FOLDER%/root" .. - if not [%BUILDER%]==[msbuild] cmake --build "build-dir" --config RelWithDebInfo - if not [%BUILDER%]==[msbuild] cmake --build "build-dir" --target install --config RelWithDebInfo + + From e3c85f05aafc1a6b6eddd4fc1a38a92aea9d78ba Mon Sep 17 00:00:00 2001 From: Zac Walker Date: Tue, 28 Jun 2022 14:24:14 +0200 Subject: [PATCH 5/5] Testing adding ARM64 target 4 --- appveyor.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index b6234c0..13100a6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -12,8 +12,7 @@ environment: CONFIGURATION: "Release_VC9-UNICODE" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 CMAKE_GENERATOR: "Visual Studio 12 2013" - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 - TARGET_CONFIG: "--config RelWithDebInfo" + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2013 CMAKE_GENERATOR: "Visual Studio 12 2013 Win64" TARGET_CONFIG: "--config RelWithDebInfo" - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015