diff --git a/CHANGES b/CHANGES index 8d47d92f..f199e0ef 100644 --- a/CHANGES +++ b/CHANGES @@ -1393,6 +1393,10 @@ Version history * mago: do not hide __param_.. function arguments as compiler generated symbols * fixed building with VS 2022 -2022-01-03 version 1.4.0-rc5 +2025-01-03 version 1.4.0-rc5 * fix selection of dbuild.dll for VS 17.12 * installer now supports 2 parallel installations of VS 2022 + +2025-03-02 version 1.4.0-rc6 + * now works with Visual Studio for Windows on ARM64 + * installer now supports 4 parallel installations of VS 2022 diff --git a/Makefile b/Makefile index 9093f4ae..a5ba962f 100644 --- a/Makefile +++ b/Makefile @@ -42,6 +42,7 @@ MSBUILD15 = "c:\Program Files (x86)\Microsoft Visual Studio\2019\Preview\MSBuild # CONFIG = Release LDC CONFIG = Release COFF32 CONFIG_X64 = Release COFF32 +CONFIG_ARM64 = Release LDC ARM CONFIG_DMDSERVER = Release COFF32 ############################################################## @@ -63,6 +64,9 @@ visuald_vs: visuald_vs_x64: devenv /Project "visuald" /Build "$(CONFIG_X64)|x64" visuald_vs10.sln +visuald_vs_arm64: + devenv /Project "visuald" /Build "$(CONFIG_ARM64)|x64" visuald_vs10.sln + visuald_test: devenv /Project "visuald" /Build "TestDebug|Win32" visuald_vs10.sln bin\TestDebug\VisualD\VisualD.exe @@ -204,10 +208,17 @@ mago_vs17: magocc_x64: cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=x64;PlatformToolset=v143" /target:Expression\MagoNatCC MagoDbg_2010.sln +magocc_arm64: + cd ..\..\mago && msbuild "/p:Configuration=Release StaticDE;Platform=ARM64;PlatformToolset=v143" /target:Expression\MagoNatCC MagoDbg_2010.sln + magogc: cd ..\..\mago && devenv /Build "Release|Win32" /Project "MagoGC" magodbg_2010.sln cd ..\..\mago && devenv /Build "Release|x64" /Project "MagoGC" magodbg_2010.sln +magogc_ldc: + cd ..\..\mago && devenv /Build "Release|Win32"/Project "MagoGC" /projectconfig "Release LDC|Win32" magodbg_2010.sln + cd ..\..\mago && devenv /Build "Release|x64" /Project "MagoGC" /projectconfig "Release LDC|x64" magodbg_2010.sln + cv2pdb: cd ..\..\cv2pdb\trunk && devenv /Project "cv2pdb" /Build "Release|Win32" src\cv2pdb_vs12.sln cd ..\..\cv2pdb\trunk && devenv /Project "dviewhelper" /Build "Release|Win32" src\cv2pdb_vs12.sln @@ -236,7 +247,7 @@ $(DCXXFILT_EXE): tools\dcxxfilt.d ################################## # create installer -install_release_modules: install_modules fake_dparser cv2pdb_vs17 mago_vs17 magocc_x64 magogc dbuild12 dbuild14 dbuild15 +install_release_modules: install_modules fake_dparser cv2pdb_vs17 mago_vs17 magocc_x64 magocc_arm64 magogc magogc_ldc dbuild12 dbuild14 dbuild15 install_vs: install_release_modules install_only @@ -246,7 +257,7 @@ install_vs_only_vs2017: install_modules dparser dparser_test cv2pdb_vs15 mago_vs install_modules: d_modules vdextension vdext15 visualdwizard dcxxfilt -d_modules: prerequisites visuald_vs visuald_vs_x64 vdserver dmdserver +d_modules: prerequisites visuald_vs visuald_vs_x64 visuald_vs_arm64 vdserver dmdserver appveyor: d_modules cv2pdb_vs16 mago_vs16 magogc diff --git a/VERSION b/VERSION index 8cdc3efe..bdcee320 100644 --- a/VERSION +++ b/VERSION @@ -2,4 +2,4 @@ #define VERSION_MINOR 4 #define VERSION_REVISION 0 #define VERSION_BETA -rc -#define VERSION_BUILD 5 +#define VERSION_BUILD 6 diff --git a/build/build.visualdproj b/build/build.visualdproj index 25f129b7..4efdf9e9 100644 --- a/build/build.visualdproj +++ b/build/build.visualdproj @@ -1521,6 +1521,514 @@ echo. >"$(TargetDir)\build.dep" echo Success >"$(TargetPath)" +echo. >"$(TargetDir)\build.dep" + *.obj;*.cmd;*.build;*.json;*.dep + + + 0 + 0 + 1 + 0 + 0 + 3 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + $(CC) -c + 1 + 0 + $(DMDInstallDir)windows\bin\dmd.exe + + + ..\bin\$(ConfigurationName) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(TargetName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 1 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(IntDir)\$(ProjectName).sdk + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + + + echo Success >"$(TargetPath)" +echo. >"$(TargetDir)\build.dep" + *.obj;*.cmd;*.build;*.json;*.dep + + + 0 + 0 + 1 + 0 + 0 + 3 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + $(CC) -c + 1 + 0 + $(DMDInstallDir)windows\bin\dmd.exe + + + ..\bin\$(ConfigurationName) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(TargetName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 1 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(IntDir)\$(ProjectName).sdk + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + + + echo Success >"$(TargetPath)" +echo. >"$(TargetDir)\build.dep" + *.obj;*.cmd;*.build;*.json;*.dep + + + 0 + 0 + 1 + 0 + 0 + 3 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + $(DMDInstallDir)windows\bin\dmd.exe + + + ..\bin\$(ConfigurationName) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(TargetName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 0 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(IntDir)\$(ProjectName).sdk + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 1 + 0 + + + echo Success >"$(TargetPath)" +echo. >"$(TargetDir)\build.dep" + *.obj;*.cmd;*.build;*.json;*.dep + + + 0 + 0 + 1 + 0 + 0 + 3 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + $(DMDInstallDir)windows\bin\dmd.exe + + + ..\bin\$(ConfigurationName)\$(PlatformName) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(TargetName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 0 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(IntDir)\$(ProjectName).sdk + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 1 + 0 + + + echo Success >"$(TargetPath)" echo. >"$(TargetDir)\build.dep" *.obj;*.cmd;*.build;*.json;*.dep @@ -1561,13 +2069,34 @@ if errorlevel 1 goto reportError dmd -m32mscoff -map "$(IntDir)\$(InputName).map" "-of$(OutDir)\$(InputName).exe" $(InputPath) ..\tools\nostacktrace.d user32.lib -L/SUBSYSTEM:CONSOLE,5.01" dependencies="..\tools\nostacktrace.d" outfile="$(OutDir)\$(InputName).exe" name="Release COFF32|Win32" /> + + + - + @@ -1603,10 +2132,31 @@ dmd -m32mscoff -map "$(IntDir)\$(InputName).map" "-of$(OutDir)\$( if errorlevel 1 goto reportError ldmd2 -m32 -map "$(IntDir)\$(InputName).map" "-of$(OutDir)\$(InputName).exe" $(InputPath) ..\tools\nostacktrace.d ..\stdext\string.d" dependencies="..\tools\nostacktrace.d" outfile="$(OutDir)\$(InputName).exe" name="Release LDC|Win32" /> - + + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + c:\u\MinGW\msys\1.0\bin\sh.exe -c gdmd + .. + .. + ..\bin\$(ConfigurationName)\$(PLATFORMNAME) + $(OutDir) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(ProjectName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 1 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).lib + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + + + + *.obj + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + c:\u\MinGW\msys\1.0\bin\sh.exe -c gdmd + .. + .. + ..\bin\$(ConfigurationName)\$(PLATFORMNAME) + $(OutDir) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(ProjectName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 1 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).lib + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + -march=arm64 + + + *.obj + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + c:\u\MinGW\msys\1.0\bin\sh.exe -c gdmd + .. + .. + ..\bin\$(ConfigurationName)\$(PLATFORMNAME) + $(OutDir) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(ProjectName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 1 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).lib + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + + + + *.obj + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + c:\u\MinGW\msys\1.0\bin\sh.exe -c gdmd + .. + .. + ..\bin\$(ConfigurationName)\$(PLATFORMNAME) + $(OutDir) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(ProjectName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 1 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).lib + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 1 + 0 + -march=arm64 + + + *.obj + diff --git a/c2d/cpp2d.visualdproj b/c2d/cpp2d.visualdproj index b9878386..6c016eb2 100644 --- a/c2d/cpp2d.visualdproj +++ b/c2d/cpp2d.visualdproj @@ -64,6 +64,7 @@ 0 0 0 + 0 0 0 0 @@ -189,6 +190,7 @@ 0 0 0 + 0 0 0 0 @@ -314,6 +316,7 @@ 0 0 0 + 0 0 2 1 @@ -439,6 +442,7 @@ 0 0 0 + 0 0 0 0 @@ -564,6 +568,7 @@ 0 0 0 + 0 0 0 0 @@ -689,6 +694,7 @@ 0 0 0 + 0 0 0 0 @@ -814,6 +820,7 @@ 0 0 0 + 0 0 1 0 @@ -939,6 +946,7 @@ 0 0 0 + 0 0 0 0 @@ -1064,6 +1072,7 @@ 0 0 0 + 0 0 2 0 @@ -1189,6 +1198,7 @@ 0 0 0 + 0 0 2 0 @@ -1314,6 +1324,7 @@ 0 0 0 + 0 0 0 0 @@ -1439,6 +1450,7 @@ 0 0 0 + 0 0 0 0 @@ -1564,6 +1576,7 @@ 0 0 0 + 0 0 2 0 @@ -1689,6 +1702,7 @@ 0 0 0 + 0 0 2 0 @@ -1814,6 +1828,7 @@ 0 0 0 + 0 0 0 0 @@ -1939,6 +1954,7 @@ 0 0 0 + 0 0 0 0 @@ -2000,6 +2016,510 @@ *.obj + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + c:\u\MinGW\msys\1.0\bin\sh.exe -c gdmd + .. + .. + ..\bin\$(ConfigurationName)\$(PLATFORMNAME) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(ProjectName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 1 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).exe + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + + + + *.obj + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + c:\u\MinGW\msys\1.0\bin\sh.exe -c gdmd + .. + .. + ..\bin\$(ConfigurationName)\$(PLATFORMNAME) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(ProjectName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 0 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + comctl32.lib ntstc_libcmt.lib + + + + $(OutDir)\$(ProjectName).exe + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + --march=aarch64 + + + *.obj + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + c:\u\MinGW\msys\1.0\bin\sh.exe -c gdmd + .. + .. + ..\bin\$(ConfigurationName)\$(PLATFORMNAME) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(ProjectName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 1 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).exe + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + + + + *.obj + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + c:\u\MinGW\msys\1.0\bin\sh.exe -c gdmd + .. + .. + ..\bin\$(ConfigurationName)\$(PLATFORMNAME) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(ProjectName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 0 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + comctl32.lib ntstc_libcmt.lib + + + + $(OutDir)\$(ProjectName).exe + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 1 + 0 + --march=aarch64 + + + *.obj + diff --git a/c2d/vsi2d.visualdproj b/c2d/vsi2d.visualdproj index 80d4ab08..9485b53d 100644 --- a/c2d/vsi2d.visualdproj +++ b/c2d/vsi2d.visualdproj @@ -64,6 +64,7 @@ 0 0 0 + 0 0 0 0 @@ -189,6 +190,7 @@ 0 0 0 + 0 0 0 0 @@ -314,6 +316,7 @@ 0 0 0 + 0 0 0 0 @@ -439,6 +442,7 @@ 0 0 0 + 0 0 0 0 @@ -564,6 +568,7 @@ 0 0 0 + 0 0 0 1 @@ -689,6 +694,7 @@ 0 0 0 + 0 0 0 0 @@ -814,6 +820,7 @@ 0 0 0 + 0 0 2 0 @@ -881,7 +888,7 @@ 0 0 0 - 0 + 2 0 0 0 @@ -939,6 +946,7 @@ 0 0 0 + 0 0 2 0 @@ -1064,6 +1072,7 @@ 0 0 0 + 0 0 0 0 @@ -1189,6 +1198,7 @@ 0 0 0 + 0 0 0 0 @@ -1314,6 +1324,7 @@ 0 0 0 + 0 0 2 0 @@ -1439,6 +1450,7 @@ 0 0 0 + 0 0 2 0 @@ -1564,6 +1576,7 @@ 0 0 0 + 0 0 0 0 @@ -1689,6 +1702,7 @@ 0 0 0 + 0 0 0 0 @@ -1814,6 +1828,7 @@ 0 0 0 + 0 0 0 0 @@ -1939,6 +1954,7 @@ 0 0 0 + 0 0 0 0 @@ -2000,6 +2016,258 @@ *.obj + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + m:\s\d\rainers\windows\bin\dmd_msc.exe + .. + .. + ..\bin\$(ConfigurationName) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 0 + $(IntDir)\$(ProjectName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 1 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).exe + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + + + + *.obj + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + m:\s\d\rainers\windows\bin\dmd_msc.exe + .. + .. + ..\bin\$(ConfigurationName)\$(PLATFORMNAME) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(ProjectName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 1 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).exe + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + + + + *.obj + diff --git a/dfmt/dfmt.visualdproj b/dfmt/dfmt.visualdproj index 9f519005..1bdd6a58 100644 --- a/dfmt/dfmt.visualdproj +++ b/dfmt/dfmt.visualdproj @@ -64,6 +64,7 @@ 0 0 0 + 0 0 0 0 @@ -189,6 +190,7 @@ 0 0 0 + 0 0 0 0 @@ -314,6 +316,7 @@ 0 0 0 + 0 0 0 0 @@ -439,6 +442,7 @@ 0 0 0 + 0 0 0 0 @@ -564,6 +568,7 @@ 0 0 0 + 0 0 0 0 @@ -689,6 +694,7 @@ 0 0 0 + 0 0 0 0 @@ -814,6 +820,7 @@ 0 0 0 + 0 0 0 0 @@ -939,6 +946,7 @@ 0 0 0 + 0 0 0 0 @@ -1064,6 +1072,7 @@ 0 0 0 + 0 0 0 0 @@ -1189,6 +1198,7 @@ 0 0 0 + 0 0 0 0 @@ -1314,6 +1324,7 @@ 0 0 0 + 0 0 0 0 @@ -1439,6 +1450,7 @@ 0 0 0 + 0 0 2 0 @@ -1500,6 +1512,762 @@ *.obj;*.cmd;*.build;*.json;*.dep;*.tlog + + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + $(CC) -c + 1 + 0 + $(DMDInstallDir)windows\bin\dmd.exe + ..;. + . + ..\bin\$(ConfigurationName)\$(PlatformName) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(TargetName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 1 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).lib + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + + + + *.obj;*.cmd;*.build;*.json;*.dep;*.tlog + + + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + $(DMDInstallDir)windows\bin\dmd.exe + + + ..\bin\$(ConfigurationName)\$(PlatformName) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(TargetName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 1 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).lib + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + -march=arm64 + + + *.obj;*.cmd;*.build;*.json;*.dep;*.tlog + + + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + $(CC) -c + 1 + 0 + $(DMDInstallDir)windows\bin\dmd.exe + ..;. + . + ..\bin\$(ConfigurationName)\$(PlatformName) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(TargetName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 0 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).lib + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + + + + *.obj;*.cmd;*.build;*.json;*.dep;*.tlog + + + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + $(DMDInstallDir)windows\bin\dmd.exe + + + ..\bin\$(ConfigurationName)\$(PlatformName) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(TargetName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 0 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).lib + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + + + + *.obj;*.cmd;*.build;*.json;*.dep;*.tlog + + + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + $(CC) -c + 1 + 0 + $(DMDInstallDir)windows\bin\dmd.exe + ..;. + . + ..\bin\$(ConfigurationName)\$(PlatformName) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(TargetName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 1 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).lib + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + + + + *.obj;*.cmd;*.build;*.json;*.dep;*.tlog + + + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + $(DMDInstallDir)windows\bin\dmd.exe + + + ..\bin\$(ConfigurationName)\$(PlatformName) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(TargetName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 1 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).lib + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 1 + 0 + -march=arm64 + + + *.obj;*.cmd;*.build;*.json;*.dep;*.tlog + diff --git a/nsis/replaceinfile.nsh b/nsis/replaceinfile.nsh index c45efc47..a27e668c 100644 --- a/nsis/replaceinfile.nsh +++ b/nsis/replaceinfile.nsh @@ -348,3 +348,51 @@ FunctionEnd !insertmacro RFF "" !insertmacro RFF "un." +; StrCount adapted from https://nsis.sourceforge.io/StrCount +!define StrCount "!insertmacro StrCount" + +!macro StrCount str look + Push ${str} + Push ${look} + Call StrCount +!macroend + +Function StrCount + ;takes the following parameters by the stack: + ; string to lookup + ; string where to search + ;returns count on top of stack + + Exch $1 ;Stack = ($1 str) + Exch ;Stack = (str $1) + Exch $0 ;Stack = ($0 $1) + Push $3 + Push $4 + Push $5 + Push $6 ;Stack = ($6 $5 $4 $3 $0 $1) + + StrLen $4 $1 + StrCpy $5 0 + StrCpy $6 0 + + ;now $0=str, $1=look, $3=tmp str, $4=lookup len, $5=index, $6=count + + loop: + StrCpy $3 $0 $4 $5 + StrCmp $3 "" end + StrCmp $3 $1 count ignore + count: + IntOp $6 $6 + 1 ;count++ + ignore: + IntOp $5 $5 + 1 ;index++ + goto loop + end: + + Exch 5 ;Stack = ($1 $5 $4 $3 $0 $6) + Pop $1 + Pop $5 + Pop $4 + Pop $3 + Pop $0 ;Stack = ($6) + Exch $6 ;count is on top stack +FunctionEnd diff --git a/nsis/visuald.nsi b/nsis/visuald.nsi index 48b0f8f7..a223a3b4 100644 --- a/nsis/visuald.nsi +++ b/nsis/visuald.nsi @@ -99,6 +99,9 @@ !ifndef CONFIG_X64 !define CONFIG_X64 "Release COFF32" !endif +!ifndef CONFIG_ARM64 + !define CONFIG_ARM64 "Release LDC ARM" +!endif !ifndef CONFIG_DMDSERVER !define CONFIG_DMDSERVER "Release" !endif @@ -292,6 +295,8 @@ Section "Visual Studio package" SecPackage !ifdef VS2022 ${SetOutPath} "$INSTDIR\x64" ${File} "..\bin\${CONFIG_X64}\x64\" ${DLLNAME} + ${SetOutPath} "$INSTDIR\arm64" + ${File} "..\bin\${CONFIG_ARM64}\" ${DLLNAME} !endif ${SetOutPath} "$INSTDIR" @@ -694,6 +699,22 @@ ${MementoSection} "Install in VS 2022" SecVS2022_2 ${MementoSectionEnd} +;-------------------------------- +${MementoSection} "Install in VS 2022" SecVS2022_3 + + Push 3 + Call InstallForVS2022 + +${MementoSectionEnd} + +;-------------------------------- +${MementoSection} "Install in VS 2022" SecVS2022_4 + + Push 4 + Call InstallForVS2022 + +${MementoSectionEnd} + ;-------------------------------- ${MementoSection} "Install in VS 2022 Build Tools" SecVS2022BT @@ -795,6 +816,44 @@ ${MementoSection} "MSBuild integration" SecMSBuild ${AddItem} "$INSTDIR\msbuild\general2_d.17.0.xml" NoVS2022_2: + SectionGetFlags ${SecVS2022_3} $2 + IntOp $2 $2 & ${SF_SELECTED} + IntCmp $2 ${SF_SELECTED} 0 NoVS2022_3 + + Push 3 + Call DetectVS2022_InstallationFolder + StrCmp $1 "" NoVS2022_3 + ${RegisterPlatform} "$1\MsBuild\Microsoft\VC\v170" "x64" + ${RegisterPlatform} "$1\MsBuild\Microsoft\VC\v170" "Win32" + ${RegisterIcons} "17.0" + + !define V170_GENERAL_XML_3 "$1\MsBuild\Microsoft\VC\v170\1033\general.xml" + + ExecWait 'rundll32 "$INSTDIR\${DLLNAME}" GenerateGeneralXML ${V170_GENERAL_XML_3};$INSTDIR\msbuild\general_d.snippet;$INSTDIR\msbuild\general3_d.17.0.xml' + ${AddItem} "$INSTDIR\msbuild\general3_d.17.0.xml" + NoVS2022_3: + + SectionGetFlags ${SecVS2022_4} $2 + IntOp $2 $2 & ${SF_SELECTED} + IntCmp $2 ${SF_SELECTED} 0 NoVS2022_4 + + Push 4 + Call DetectVS2022_InstallationFolder + StrCmp $1 "" NoVS2022_4 + ${RegisterPlatform} "$1\MsBuild\Microsoft\VC\v170" "x64" + ${RegisterPlatform} "$1\MsBuild\Microsoft\VC\v170" "Win32" + ${RegisterIcons} "17.0" + + !define V170_GENERAL_XML_4 "$1\MsBuild\Microsoft\VC\v170\1033\general.xml" + + ExecWait 'rundll32 "$INSTDIR\${DLLNAME}" GenerateGeneralXML ${V170_GENERAL_XML_4};$INSTDIR\msbuild\general_d.snippet;$INSTDIR\msbuild\general4_d.17.0.xml' + ${AddItem} "$INSTDIR\msbuild\general4_d.17.0.xml" + NoVS2022_4: + + SectionGetFlags ${SecVS2022BT} $2 + IntOp $2 $2 & ${SF_SELECTED} + IntCmp $2 ${SF_SELECTED} 0 NoVS2022BT + Call DetectVS2022BuildTools_InstallationFolder StrCmp $1 "" NoVS2022BT ${RegisterPlatform} "$1\Common7\IDE\VC\VCTargets" "x64" @@ -811,6 +870,10 @@ ${MementoSection} "MSBuild integration" SecMSBuild !endif !ifdef VS2019 + SectionGetFlags ${SecVS2019} $2 + IntOp $2 $2 & ${SF_SELECTED} + IntCmp $2 ${SF_SELECTED} 0 NoVS2019 + Call DetectVS2019_InstallationFolder StrCmp $1 "" NoVS2019 ${RegisterPlatform} "$1\MsBuild\Microsoft\VC\v160" "x64" @@ -824,6 +887,10 @@ ${MementoSection} "MSBuild integration" SecMSBuild NoVS2019: + SectionGetFlags ${SecVS2019BT} $2 + IntOp $2 $2 & ${SF_SELECTED} + IntCmp $2 ${SF_SELECTED} 0 NoVS2019BT + Call DetectVS2019BuildTools_InstallationFolder StrCmp $1 "" NoVS2019BT ${RegisterPlatform} "$1\Common7\IDE\VC\VCTargets" "x64" @@ -839,6 +906,10 @@ ${MementoSection} "MSBuild integration" SecMSBuild !endif + SectionGetFlags ${SecVS2017BT} $2 + IntOp $2 $2 & ${SF_SELECTED} + IntCmp $2 ${SF_SELECTED} 0 NoVS2017BT + Call DetectVS2017BuildTools_InstallationFolder StrCmp $1 "" NoVS2017BT ${RegisterPlatform} "$1\Common7\IDE\VC\VCTargets" "x64" @@ -852,6 +923,10 @@ ${MementoSection} "MSBuild integration" SecMSBuild NoVS2017BT: + SectionGetFlags ${SecVS2017} $2 + IntOp $2 $2 & ${SF_SELECTED} + IntCmp $2 ${SF_SELECTED} 0 NoVS2017 + ReadRegStr $1 ${VS_REGISTRY_ROOT} "${VS2017_INSTALL_KEY}" "15.0" IfErrors NoVS2017 ${RegisterPlatform} "$1\Common7\IDE\VC\VCTargets" "x64" @@ -865,6 +940,10 @@ ${MementoSection} "MSBuild integration" SecMSBuild NoVS2017: + SectionGetFlags ${SecVS2015} $2 + IntOp $2 $2 & ${SF_SELECTED} + IntCmp $2 ${SF_SELECTED} 0 NoMSBuild14 + ReadRegStr $1 HKLM "SOFTWARE\Microsoft\MSBuild\ToolsVersions\14.0" MSBuildToolsRoot IfErrors NoMSBuild14 ${RegisterPlatform} "$1\Microsoft.Cpp\v4.0\V140" "x64" @@ -878,6 +957,10 @@ ${MementoSection} "MSBuild integration" SecMSBuild NoMSBuild14: + SectionGetFlags ${SecVS2013} $2 + IntOp $2 $2 & ${SF_SELECTED} + IntCmp $2 ${SF_SELECTED} 0 NoMSBuild12 + ReadRegStr $1 HKLM "SOFTWARE\Microsoft\MSBuild\ToolsVersions\12.0" MSBuildToolsRoot IfErrors NoMSBuild12 ${RegisterPlatform} "$1\Microsoft.Cpp\v4.0\V120" "x64" @@ -964,6 +1047,8 @@ ${MementoSection} "mago" SecMago ${File} ${MAGO_SOURCE}\bin\x64\Release\ MagoRemote.exe ${File} ${MAGO_SOURCE}\bin\x64\Release\ MagoGC64.dll ${File} ${MAGO_SOURCE}\bin\Win32\Release\ MagoGC32.dll + ${File} "${MAGO_SOURCE}\bin\x64\Release LDC\" MagoGC64_LDC.dll + ${File} "${MAGO_SOURCE}\bin\Win32\Release LDC\" MagoGC32_LDC.dll ${File} ${MAGO_SOURCE}\ LICENSE.TXT ${File} ${MAGO_SOURCE}\ NOTICE.TXT @@ -1083,6 +1168,8 @@ SectionEnd !insertmacro MUI_DESCRIPTION_TEXT ${SecVS2019} $(DESC_SecVS2019) !insertmacro MUI_DESCRIPTION_TEXT ${SecVS2022} $(DESC_SecVS2022) !insertmacro MUI_DESCRIPTION_TEXT ${SecVS2022_2} $(DESC_SecVS2022) + !insertmacro MUI_DESCRIPTION_TEXT ${SecVS2022_3} $(DESC_SecVS2022) + !insertmacro MUI_DESCRIPTION_TEXT ${SecVS2022_4} $(DESC_SecVS2022) !insertmacro MUI_DESCRIPTION_TEXT ${SecVS2017BT} $(DESC_SecVS2017BT) !insertmacro MUI_DESCRIPTION_TEXT ${SecVS2019BT} $(DESC_SecVS2019BT) !insertmacro MUI_DESCRIPTION_TEXT ${SecVS2022BT} $(DESC_SecVS2022BT) @@ -1424,6 +1511,28 @@ Function .onInit SectionSetText ${SecVS2022_2} "Install in $2" Done_VS2022_2: + ClearErrors + Push 3 + Call DetectVS2022_InstallationFolder + StrCmp $1 "" 0 Installed_VS2022_3 + SectionSetFlags ${SecVS2022_3} ${SF_RO} + SectionSetText ${SecVS2022_3} "" + goto Done_VS2022_3 + Installed_VS2022_3: + SectionSetText ${SecVS2022_3} "Install in $2" + Done_VS2022_3: + + ClearErrors + Push 4 + Call DetectVS2022_InstallationFolder + StrCmp $1 "" 0 Installed_VS2022_4 + SectionSetFlags ${SecVS2022_4} ${SF_RO} + SectionSetText ${SecVS2022_4} "" + goto Done_VS2022_4 + Installed_VS2022_4: + SectionSetText ${SecVS2022_4} "Install in $2" + Done_VS2022_4: + ; detect VS2022 Build Tools ClearErrors Call DetectVS2022BuildTools_InstallationFolder @@ -1911,13 +2020,10 @@ Function DetectVS2022_InstallationFolder StrCpy $3 $2 14 ; MessageBox MB_YESNO|MB_ICONQUESTION "Visual Studio in: '$3'$\n$\nMore?" IDYES 0 IDNO done StrCmp $3 "Visual Studio " 0 NotVS2022 - StrCpy $3 $2 12 -12 - ; MessageBox MB_YESNO|MB_ICONQUESTION "2022 Preview in: '$3'$\n$\nMore?" IDYES 0 IDNO done - StrCmp $3 "2022 Preview" IsVS2022 - StrCpy $3 $2 4 -4 - ; MessageBox MB_YESNO|MB_ICONQUESTION "2022 in: '$3'$\n$\nMore?" IDYES 0 IDNO done - StrCmp $3 "2022" IsVS2022 NotVS2022 - IsVS2022: + ${StrCount} $2 "2022" + Pop $3 + ; MessageBox MB_YESNO|MB_ICONQUESTION "2022 count '$3'$\n$\nMore?" IDYES 0 IDNO done + IntCmp $3 0 NotVS2022 NotVS2022 0 ReadRegStr $3 HKLM SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\$1 InstallLocation IfErrors NoInstallLocation ; MessageBox MB_YESNO|MB_ICONQUESTION "$3$\n$\nMore?" IDYES 0 IDNO done @@ -1991,9 +2097,12 @@ Function InstallForVS2022 !insertmacro ReplaceInFile "$1${EXTENSION_DIR}\extension.vsixmanifest" "VDVERSION" "${VERSION_MAJOR}.${VERSION_MINOR}" NoBackup !ifdef MAGO - ${SetOutPath} "$1..\Packages\Debugger" + ${SetOutPath} "$1..\Packages\Debugger\x64" ${File} ${MAGO_SOURCE}\bin\x64\Release\ MagoNatCC.dll ${File} ${MAGO_SOURCE}\bin\x64\Release\ MagoNatCC.vsdconfig + ${SetOutPath} "$1..\Packages\Debugger\arm64" + ${File} ${MAGO_SOURCE}\bin\ARM64\Release\ MagoNatCC.dll + ${File} ${MAGO_SOURCE}\bin\ARM64\Release\ MagoNatCC.vsdconfig !endif ${SetOutPath} "$1\PublicAssemblies" diff --git a/sdk/port/base.d b/sdk/port/base.d index 3c8f91e9..33487dba 100644 --- a/sdk/port/base.d +++ b/sdk/port/base.d @@ -466,8 +466,9 @@ alias void WriteULongPtrRelease; alias void WriteULongPtrNoFence; alias void WriteULongPtrRaw; -version(GNU) extern(C) DWORD __readfsdword (DWORD Offset) { assert(0); } -else extern(C) DWORD __readfsdword (DWORD Offset) { asm { naked; mov EAX,[ESP+4]; mov EAX, FS:[EAX]; } } + version(GNU) extern(C) DWORD __readfsdword (DWORD Offset) { assert(0); } +else version(AArch64) extern(C) DWORD __readfsdword (DWORD Offset) { assert(0); } +else extern(C) DWORD __readfsdword (DWORD Offset) { asm { naked; mov EAX,[ESP+4]; mov EAX, FS:[EAX]; } } enum TRUE = 1; public import sdk.win32.winbase; diff --git a/sdk/vsi.visualdproj b/sdk/vsi.visualdproj index 2b943a9a..9e70d20d 100644 --- a/sdk/vsi.visualdproj +++ b/sdk/vsi.visualdproj @@ -64,6 +64,7 @@ 0 0 0 + 0 0 0 0 @@ -189,6 +190,7 @@ 0 0 0 + 0 0 0 0 @@ -314,6 +316,7 @@ 0 0 0 + 0 0 0 0 @@ -439,6 +442,7 @@ 0 0 0 + 0 0 0 0 @@ -564,6 +568,7 @@ 0 0 0 + 0 0 1 0 @@ -689,6 +694,7 @@ 0 0 0 + 0 0 1 0 @@ -814,6 +820,7 @@ 0 0 0 + 0 0 0 0 @@ -939,6 +946,7 @@ 0 0 0 + 0 0 0 0 @@ -1064,6 +1072,7 @@ 0 0 0 + 0 0 2 0 @@ -1189,6 +1198,7 @@ 0 0 0 + 0 0 2 0 @@ -1314,6 +1324,7 @@ 0 0 0 + 0 0 0 0 @@ -1439,6 +1450,7 @@ 0 0 0 + 0 0 0 0 @@ -1564,6 +1576,7 @@ 0 0 0 + 0 0 2 0 @@ -1689,6 +1702,7 @@ 0 0 0 + 0 0 2 0 @@ -1814,6 +1828,7 @@ 0 0 0 + 0 0 0 0 @@ -1939,6 +1954,7 @@ 0 0 0 + 0 0 0 0 @@ -2000,6 +2016,510 @@ *.obj + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + m:\s\d\rainers\windows\bin\dmd_msc.exe + .. + + ..\bin\$(ConfigurationName) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(ProjectName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 0 + "$(VisualDInstallDir)cv2pdb.exe" + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).lib + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 1 + 0 + + + + *.obj + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + m:\s\d\rainers\windows\bin\dmd_msc.exe + .. + + ..\bin\$(ConfigurationName)\$(PLATFORMNAME) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(ProjectName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 0 + "$(VisualDInstallDir)cv2pdb.exe" + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).lib + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 1 + 0 + -march=aarch64 + + + *.obj + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + m:\s\d\rainers\windows\bin\dmd_msc.exe + .. + + ..\bin\$(ConfigurationName) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(ProjectName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 0 + "$(VisualDInstallDir)cv2pdb.exe" + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).lib + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 1 + 0 + + + + *.obj + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + m:\s\d\rainers\windows\bin\dmd_msc.exe + .. + + ..\bin\$(ConfigurationName)\$(PLATFORMNAME) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(ProjectName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 0 + "$(VisualDInstallDir)cv2pdb.exe" + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).lib + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 1 + 0 + -march=aarch64 + + + *.obj + diff --git a/stdext/stdext.visualdproj b/stdext/stdext.visualdproj index 7122711d..e579ba07 100644 --- a/stdext/stdext.visualdproj +++ b/stdext/stdext.visualdproj @@ -64,6 +64,7 @@ 0 0 0 + 0 0 0 0 @@ -189,6 +190,7 @@ 0 0 0 + 0 0 0 0 @@ -314,6 +316,7 @@ 0 0 0 + 0 0 1 0 @@ -439,6 +442,7 @@ 0 0 0 + 0 0 0 0 @@ -564,6 +568,7 @@ 0 0 0 + 0 0 0 1 @@ -689,6 +694,7 @@ 0 0 0 + 0 0 1 0 @@ -814,6 +820,7 @@ 0 0 0 + 0 0 0 0 @@ -939,6 +946,7 @@ 0 0 0 + 0 0 0 0 @@ -1064,6 +1072,7 @@ 0 0 0 + 0 0 2 0 @@ -1189,6 +1198,7 @@ 0 0 0 + 0 0 2 0 @@ -1314,6 +1324,7 @@ 0 0 0 + 0 0 0 0 @@ -1439,6 +1450,7 @@ 0 0 0 + 0 0 0 0 @@ -1564,6 +1576,7 @@ 0 0 0 + 0 0 2 0 @@ -1689,6 +1702,7 @@ 0 0 0 + 0 0 2 0 @@ -1814,6 +1828,7 @@ 0 0 0 + 0 0 0 0 @@ -1939,6 +1954,7 @@ 0 0 0 + 0 0 0 0 @@ -2000,6 +2016,510 @@ *.obj;*.cmd;*.build;*.json;*.dep + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + "c:\u\MinGW\msys\1.0\bin\sh.exe" -c "gdmd" + .. + + ..\bin\$(ConfigurationName) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(TargetName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 1 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).lib + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + + + + *.obj;*.cmd;*.build;*.json;*.dep + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + "c:\u\MinGW\msys\1.0\bin\sh.exe" -c "gdmd" + .. + + ..\bin\$(ConfigurationName)\$(PLATFORMNAME) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(TargetName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 0 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).lib + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + -march=aarch64 + + + *.obj;*.cmd;*.build;*.json;*.dep + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + "c:\u\MinGW\msys\1.0\bin\sh.exe" -c "gdmd" + .. + + ..\bin\$(ConfigurationName) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(TargetName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 1 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).lib + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + + + + *.obj;*.cmd;*.build;*.json;*.dep + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + "c:\u\MinGW\msys\1.0\bin\sh.exe" -c "gdmd" + .. + + ..\bin\$(ConfigurationName)\$(PLATFORMNAME) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(TargetName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 0 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).lib + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 1 + 0 + -march=aarch64 + + + *.obj;*.cmd;*.build;*.json;*.dep + diff --git a/vdc/dmdserver/dmdserver.visualdproj b/vdc/dmdserver/dmdserver.visualdproj index f4cacb32..32752d28 100644 --- a/vdc/dmdserver/dmdserver.visualdproj +++ b/vdc/dmdserver/dmdserver.visualdproj @@ -1764,6 +1764,510 @@ *.obj;*.cmd;*.build;*.json;*.dep + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + $(CC) -c -cpp -Isrc;src\backend;src\tk;src\root -DMARS -e -wx -DTARGET_WINDOS=1 -DDM_TARGET_CPU_X86=1 + 1 + 0 + c:\l\d\dmd2\windows\bin\dmd.exe + dmd\src ..\.. + dmd dmd\compiler\src\dmd\res + ..\..\bin\$(ConfigurationName) + $(OutDir)\$(PlatformName)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(TargetName).json + 0 + + 0 + MARS NoBackend + 0 + 0 + 0 + 0 + + + + 0 + + 1 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).exe + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + -L/STACK:8388608 + + + *.obj;*.cmd;*.build;*.json;*.dep + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + $(CC) -nologo -c -TP -Idmd\src -Idmd\compiler\src\dmd\backend -Idmd\compiler\src\dmd\tk -Idmd\compiler\src\dmd\root -Idmd\src\vcbuild -DTARGET_WINDOS=1 -FIwarnings.h + 1 + 1 + c:\l\d\dmd2\windows\bin\dmd.exe + dmd\src ..\.. + dmd dmd\compiler\src\dmd\res + ..\..\bin\$(ConfigurationName)\$(PlatformName) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(TargetName).json + 0 + + 0 + MARS NoBackend + 0 + 1 + 0 + 0 + + + + 0 + + 1 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).exe + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + -L/STACK:8388608 --march=aarch64 + + + *.obj;*.cmd;*.build;*.json;*.dep + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + $(CC) -c -cpp -Isrc;src\backend;src\tk;src\root -DMARS -e -wx -DTARGET_WINDOS=1 -DDM_TARGET_CPU_X86=1 + 1 + 0 + c:\l\d\dmd2\windows\bin\dmd.exe + dmd\src ..\.. + dmd dmd\compiler\src\dmd\res + ..\..\bin\$(ConfigurationName) + $(OutDir)\$(PlatformName)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(TargetName).json + 0 + + 0 + MARS NoBackend + 0 + 0 + 0 + 0 + + + + 0 + + 1 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).exe + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + -L/STACK:8388608 + + + *.obj;*.cmd;*.build;*.json;*.dep + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + $(CC) -nologo -c -TP -Idmd\src -Idmd\compiler\src\dmd\backend -Idmd\compiler\src\dmd\tk -Idmd\compiler\src\dmd\root -Idmd\src\vcbuild -DTARGET_WINDOS=1 -FIwarnings.h + 1 + 1 + c:\l\d\dmd2\windows\bin\dmd.exe + dmd\src ..\.. + dmd dmd\compiler\src\dmd\res + ..\..\bin\$(ConfigurationName)\$(PlatformName) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(TargetName).json + 0 + + 0 + MARS NoBackend + 0 + 1 + 0 + 0 + + + + 0 + + 1 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).exe + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + -L/STACK:8388608 --march=aarch64 + + + *.obj;*.cmd;*.build;*.json;*.dep + diff --git a/vdc/parser.visualdproj b/vdc/parser.visualdproj index f44a72e9..d0035059 100644 --- a/vdc/parser.visualdproj +++ b/vdc/parser.visualdproj @@ -40,7 +40,6 @@ 1 0 0 - 0 0 0 0 @@ -63,6 +62,9 @@ 0 0 0 + 0 + 0 + 0 0 0 0 @@ -164,7 +166,6 @@ 0 0 0 - 0 0 0 0 @@ -187,6 +188,9 @@ 0 0 0 + 0 + 0 + 0 0 0 0 @@ -288,7 +292,6 @@ 0 1 1 - 0 0 0 0 @@ -311,6 +314,9 @@ 0 0 0 + 0 + 0 + 0 0 0 0 @@ -412,7 +418,6 @@ 1 1 1 - 0 0 0 0 @@ -435,6 +440,9 @@ 0 0 0 + 0 + 0 + 0 0 0 0 @@ -536,7 +544,6 @@ 0 0 0 - 0 0 0 0 @@ -559,6 +566,9 @@ 0 0 0 + 0 + 0 + 0 0 0 0 @@ -660,7 +670,6 @@ 0 0 0 - 0 0 0 0 @@ -683,6 +692,9 @@ 0 0 0 + 0 + 0 + 0 0 0 0 @@ -784,7 +796,6 @@ 1 1 0 - 0 0 0 0 @@ -807,6 +818,9 @@ 0 0 0 + 0 + 0 + 0 0 1 0 @@ -908,7 +922,6 @@ 1 1 0 - 0 0 0 0 @@ -931,6 +944,9 @@ 0 0 0 + 0 + 0 + 0 0 1 0 @@ -1032,7 +1048,6 @@ 1 1 1 - 0 0 0 0 @@ -1055,6 +1070,9 @@ 0 0 0 + 0 + 0 + 0 0 2 0 @@ -1156,7 +1174,6 @@ 1 1 0 - 0 0 0 0 @@ -1179,6 +1196,9 @@ 0 0 0 + 0 + 0 + 0 0 2 0 @@ -1280,7 +1300,6 @@ 1 0 0 - 0 0 0 0 @@ -1303,6 +1322,9 @@ 0 0 0 + 0 + 0 + 0 0 0 0 @@ -1404,7 +1426,6 @@ 1 1 0 - 0 0 0 0 @@ -1427,6 +1448,9 @@ 0 0 0 + 0 + 0 + 0 0 0 0 @@ -1528,7 +1552,6 @@ 1 1 1 - 0 0 0 0 @@ -1551,6 +1574,9 @@ 0 0 0 + 0 + 0 + 0 0 2 0 @@ -1652,7 +1678,6 @@ 1 1 0 - 0 0 0 0 @@ -1675,6 +1700,9 @@ 0 0 0 + 0 + 0 + 0 0 2 0 @@ -1776,7 +1804,6 @@ 1 0 0 - 0 0 0 0 @@ -1799,6 +1826,9 @@ 0 0 0 + 0 + 0 + 0 0 0 0 @@ -1900,7 +1930,6 @@ 1 1 1 - 0 0 0 0 @@ -1923,6 +1952,9 @@ 0 0 0 + 0 + 0 + 0 0 0 0 @@ -1984,6 +2016,510 @@ *.obj + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + m:\s\d\rainers\windows\bin\dmd_msc.exe + .. + . + ..\bin\$(ConfigurationName) + $(OutDir)\$(ProjectName) + + + 0 + $(OutDir)\doc + + + + 0 + $(OutDir)\di + + 1 + $(IntDir)\$(ProjectName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 0 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).lib + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 1 + 0 + + + + *.obj + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 1 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + m:\s\d\rainers\windows\bin\dmd_msc.exe + .. + . + ..\bin\$(ConfigurationName)\$(PLATFORMNAME) + $(OutDir)\$(ProjectName) + + + 0 + $(OutDir)\doc + + + + 0 + $(OutDir)\di + + 1 + $(IntDir)\$(ProjectName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 0 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).lib + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 1 + 0 + --march=aarch64 + + + *.obj + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 1 + 1 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + m:\s\d\rainers\windows\bin\dmd_msc.exe + .. + . + ..\bin\$(ConfigurationName) + $(OutDir)\$(ProjectName) + + + 0 + $(OutDir)\doc + + + + 0 + $(OutDir)\di + + 1 + $(IntDir)\$(ProjectName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 0 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).lib + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 1 + 0 + + + + *.obj + + + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + m:\s\d\rainers\windows\bin\dmd_msc.exe + .. + . + ..\bin\$(ConfigurationName)\$(PLATFORMNAME) + $(OutDir)\$(ProjectName) + + + 0 + $(OutDir)\doc + + + + 0 + $(OutDir)\di + + 1 + $(IntDir)\$(ProjectName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 0 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + + + + + $(OutDir)\$(ProjectName).lib + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 1 + 0 + --march=aarch64 + + + *.obj + diff --git a/vdc/vdserver.visualdproj b/vdc/vdserver.visualdproj index 4b1aae24..0f0e0ef8 100644 --- a/vdc/vdserver.visualdproj +++ b/vdc/vdserver.visualdproj @@ -64,6 +64,7 @@ 0 0 0 + 0 0 0 0 @@ -189,6 +190,7 @@ 0 0 0 + 0 0 0 0 @@ -314,6 +316,7 @@ 0 0 0 + 0 0 0 0 @@ -439,6 +442,7 @@ 0 0 0 + 0 0 0 0 @@ -564,6 +568,7 @@ 0 0 0 + 0 0 1 0 @@ -689,6 +694,7 @@ 0 0 0 + 0 0 1 0 @@ -814,6 +820,7 @@ 0 0 0 + 0 0 2 0 @@ -939,6 +946,7 @@ 0 0 0 + 0 0 2 0 @@ -1064,6 +1072,7 @@ 0 0 0 + 0 0 0 0 @@ -1189,6 +1198,7 @@ 0 0 0 + 0 0 0 0 @@ -1314,6 +1324,7 @@ 0 0 0 + 0 0 2 0 @@ -1439,6 +1450,7 @@ 0 0 0 + 0 0 2 0 @@ -1564,6 +1576,7 @@ 0 0 0 + 0 0 0 0 @@ -1689,6 +1702,7 @@ 0 0 0 + 0 0 0 0 @@ -1750,6 +1764,510 @@ *.obj;*.cmd;*.build;*.json;*.dep + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + m:\s\d\rainers\windows\bin\dmd_msc.exe + .. + + ..\bin\$(ConfigurationName) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(TargetName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 0 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + ole32.lib oleaut32.lib + + + + $(OutDir)\$(ProjectName).exe + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 1 + 0 + -L/SUBSYSTEM:WINDOWS + + + *.obj;*.cmd;*.build;*.json;*.dep + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + m:\s\d\rainers\windows\bin\dmd_msc.exe + .. + + ..\bin\$(ConfigurationName)\x64 + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(TargetName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 1 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + ole32.lib oleaut32.lib + + + + $(OutDir)\$(ProjectName).exe + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + -L/SUBSYSTEM:WINDOWS --march=aarch64 + + + *.obj;*.cmd;*.build;*.json;*.dep + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + m:\s\d\rainers\windows\bin\dmd_msc.exe + .. + + ..\bin\$(ConfigurationName) + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(TargetName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 0 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + ole32.lib oleaut32.lib + + + + $(OutDir)\$(ProjectName).exe + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 1 + 0 + -L/SUBSYSTEM:WINDOWS + + + *.obj;*.cmd;*.build;*.json;*.dep + + + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + m:\s\d\rainers\windows\bin\dmd_msc.exe + .. + + ..\bin\$(ConfigurationName)\x64 + $(OutDir)\$(ProjectName) + + + 0 + + + + + 0 + + + 1 + $(IntDir)\$(TargetName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 1 + $(VisualDInstallDir)cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + ole32.lib oleaut32.lib + + + + $(OutDir)\$(ProjectName).exe + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + -L/SUBSYSTEM:WINDOWS --march=aarch64 + + + *.obj;*.cmd;*.build;*.json;*.dep + diff --git a/visuald/dpackage.d b/visuald/dpackage.d index cdacc618..2f1f0a39 100644 --- a/visuald/dpackage.d +++ b/visuald/dpackage.d @@ -1815,6 +1815,8 @@ class GlobalOptions scope RegKey keyVS = new RegKey(hConfigKey, regConfigRoot, false); VSInstallDir = toUTF8(keyVS.GetString("InstallDir")); // InstallDir is ../Common7/IDE/ + if (VSInstallDir.empty) + VSInstallDir = DevEnvDir; VSInstallDir = normalizeDir(VSInstallDir); VSInstallDir = dirName(dirName(VSInstallDir)); } diff --git a/visuald/register.d b/visuald/register.d index 64a43b81..547d986b 100644 --- a/visuald/register.d +++ b/visuald/register.d @@ -32,7 +32,7 @@ import visuald.comutil; extern(Windows) HRESULT VSDllRegisterServerUser(const wchar* strRegRoot) { - return VSDllRegisterServerInternal(strRegRoot, true); + return VSDllRegisterServerInternal(strRegRoot, true, null); } // Unregisters COM objects normally and unregisters VS Packages from the specified VS registry hive under HKCU @@ -46,7 +46,7 @@ HRESULT VSDllUnregisterServerUser(const wchar* strRegRoot) extern(Windows) HRESULT VSDllRegisterServer(const wchar* strRegRoot) { - return VSDllRegisterServerInternal(strRegRoot, false); + return VSDllRegisterServerInternal(strRegRoot, false, null); } // Unregisters COM objects normally and unregisters VS Packages from the specified VS registry hive @@ -83,7 +83,7 @@ HRESULT WriteExtensionPackageDefinition(const wchar* args) string fname = to!string(wargs[idx + 1 .. $]); try { - HRESULT rc = VSDllRegisterServerInternal(registryRoot.ptr, false); + HRESULT rc = VSDllRegisterServerInternal(registryRoot.ptr, false, fname); if(rc != S_OK) return rc; @@ -511,7 +511,36 @@ HRESULT VSDllUnregisterServerInternal(in wchar* pszRegRoot, in bool useRanu) return hr; } -HRESULT VSDllRegisterServerInternal(in wchar* pszRegRoot, in bool useRanu) +bool isInArm64VS(string pkgdefname) +{ + string fname = pkgdefname; + while (!fname.empty) + { + string dname = dirName(fname); + if (dname == fname) + break; + string devenv = buildPath(dname, "devenv.exe"); + if (std.file.exists(devenv)) + { + auto data = std.file.read(devenv, 4096); + if (data.length >= IMAGE_DOS_HEADER.sizeof) + { + auto dos = cast(IMAGE_DOS_HEADER*) data.ptr; + if (dos.e_magic == IMAGE_DOS_SIGNATURE && data.length >= dos.e_lfanew + IMAGE_NT_HEADERS64.sizeof) + { + auto nt = cast(IMAGE_NT_HEADERS64*) (data.ptr + dos.e_lfanew); + if (nt.Signature == IMAGE_NT_SIGNATURE) + return nt.FileHeader.Machine == IMAGE_FILE_MACHINE_ARM64; + } + } + return false; + } + fname = dname; + } + return false; +} + +HRESULT VSDllRegisterServerInternal(in wchar* pszRegRoot, in bool useRanu, in string pkgdefname) { HKEY keyRoot = useRanu ? HKEY_CURRENT_USER : HKEY_LOCAL_MACHINE; wstring registrationRoot = GetRegistrationRoot(pszRegRoot, useRanu); @@ -522,7 +551,10 @@ HRESULT VSDllRegisterServerInternal(in wchar* pszRegRoot, in bool useRanu) float ver = guessVSVersion(registrationRoot); if (ver >= 17) - dllPath = buildPath(instPath, "x64"w, baseName(dllPath)); // 32-bit DLL used to register 64-bit DLL + { + auto arch = isInArm64VS(pkgdefname) ? "arm64"w : "x64"w; + dllPath = buildPath(instPath, arch, baseName(dllPath)); // 32-bit DLL used to register 64-bit DLL + } wstring dbuildPath; if (ver == 12) diff --git a/visuald/vdserverclient.d b/visuald/vdserverclient.d index 93b895f3..53cdd860 100644 --- a/visuald/vdserverclient.d +++ b/visuald/vdserverclient.d @@ -191,6 +191,8 @@ template _shared(T) void send(Tid id) { + version(DebugCmd) dbglog(to!string(cast(void*)this) ~ " send: " ~ to!string(mRequest) ~ " " ~ mCommand); + .send(id, cast(size_t) cast(void*) this); // .send(id, cast(shared)this); // .send(id, this); diff --git a/visuald/visuald.visualdproj b/visuald/visuald.visualdproj index e22ef195..bd9ba1fd 100644 --- a/visuald/visuald.visualdproj +++ b/visuald/visuald.visualdproj @@ -384,7 +384,7 @@ 2 0 0 - 0 + 2 0 0 0 @@ -1764,6 +1764,510 @@ *.obj + + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + m:\s\d\rainers\windows\bin\dmd_msc.exe + .. + ..;resources + ..\bin\$(ConfigurationName) + $(OutDir)\$(ProjectName) + + + 1 + $(IntDir)\doc + + + + 0 + + + 1 + $(IntDir)\$(ProjectName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 0 + $(VisualDInstallDir)\cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + uuid.lib advapi32.lib comdlg32.lib ole32.lib oleaut32.lib comctl32.lib shell32.lib gdi32.lib winmm.lib winhttp.lib + + + + $(OutDir)\$(ProjectName).dll + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + + + + *.obj + + + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + m:\s\d\rainers\windows\bin\dmd_msc.exe + .. + ..;resources + ..\bin\$(ConfigurationName) + $(OutDir)\$(ProjectName) + + + 1 + $(IntDir)\doc + + + + 0 + + + 1 + $(IntDir)\$(ProjectName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 0 + $(VisualDInstallDir)\cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + uuid.lib advapi32.lib comdlg32.lib ole32.lib oleaut32.lib comctl32.lib shell32.lib gdi32.lib winmm.lib winhttp.lib + $(LDCInstallDir)\libarm64;$(VCTOOLSINSTALLDIR)lib\arm64;$(UCRTSdkDir)Lib\$(UCRTVersion)\ucrt\arm64;$(WindowsSdkDir)lib\$(WindowsSdkVersion)\um\arm64 + + + $(OutDir)\$(ProjectName).dll + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 0 + 2 + 0 + -march=arm64 + + + *.obj + + + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + m:\s\d\rainers\windows\bin\dmd_msc.exe + .. + ..;resources + ..\bin\$(ConfigurationName) + $(OutDir)\$(ProjectName) + + + 1 + $(IntDir)\doc + + + + 0 + + + 1 + $(IntDir)\$(ProjectName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 0 + $(VisualDInstallDir)\cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + uuid.lib advapi32.lib comdlg32.lib ole32.lib oleaut32.lib comctl32.lib shell32.lib gdi32.lib winmm.lib winhttp.lib + + + + $(OutDir)\$(ProjectName).dll + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 1 + 2 + 0 + + + + *.obj + + + 0 + 0 + 2 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 1 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 1 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 2 + 0 + $(CC) -c + 1 + 0 + m:\s\d\rainers\windows\bin\dmd_msc.exe + .. + ..;resources + ..\bin\$(ConfigurationName) + $(OutDir)\$(ProjectName) + + + 1 + $(IntDir)\doc + + + + 0 + + + 1 + $(IntDir)\$(ProjectName).json + 0 + + 0 + + 0 + 0 + 0 + 0 + + + + 0 + + 0 + $(VisualDInstallDir)\cv2pdb\cv2pdb.exe + 0 + 0 + + 0 + $(IntDir)\$(SafeProjectName).mixin + + + uuid.lib advapi32.lib comdlg32.lib ole32.lib oleaut32.lib comctl32.lib shell32.lib gdi32.lib winmm.lib winhttp.lib + $(LDCInstallDir)\libarm64;$(VCTOOLSINSTALLDIR)lib\arm64;$(UCRTSdkDir)Lib\$(UCRTVersion)\ucrt\arm64;$(WindowsSdkDir)lib\$(WindowsSdkVersion)\um\arm64 + + + $(OutDir)\$(ProjectName).dll + $(IntDir)\$(SafeProjectName).pdb + $(IntDir)\$(SafeProjectName).lib + $(IntDir)\$(SafeProjectName).map + 0 + 1 + 0 + -march=arm64 + + + *.obj + diff --git a/visuald_vs10.sln b/visuald_vs10.sln index d911305a..23ae00d8 100644 --- a/visuald_vs10.sln +++ b/visuald_vs10.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.30225.117 +# Visual Studio Version 17 +VisualStudioVersion = 17.13.35507.96 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2BD51E62-6604-48AE-9E01-C940C0CA1C68}" ProjectSection(SolutionItems) = preProject @@ -78,8 +78,8 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "doc", "doc", "{36148913-8F44-4286-865F-7B140456DA36}" ProjectSection(SolutionItems) = preProject doc\BrowseInfo.dd = doc\BrowseInfo.dd - doc\build_doc.bat = doc\build_doc.bat doc\BuildFromSource.dd = doc\BuildFromSource.dd + doc\build_doc.bat = doc\build_doc.bat doc\CompileCommands.dd = doc\CompileCommands.dd doc\Coverage.dd = doc\Coverage.dd doc\CppConversion.dd = doc\CppConversion.dd @@ -325,6 +325,8 @@ Global Debug COFF32|x64 = Debug COFF32|x64 Debug GDC|Win32 = Debug GDC|Win32 Debug GDC|x64 = Debug GDC|x64 + Debug LDC ARM|Win32 = Debug LDC ARM|Win32 + Debug LDC ARM|x64 = Debug LDC ARM|x64 Debug LDC|Win32 = Debug LDC|Win32 Debug LDC|x64 = Debug LDC|x64 Debug OMF|Win32 = Debug OMF|Win32 @@ -333,6 +335,8 @@ Global Debug|x64 = Debug|x64 Release COFF32|Win32 = Release COFF32|Win32 Release COFF32|x64 = Release COFF32|x64 + Release LDC ARM|Win32 = Release LDC ARM|Win32 + Release LDC ARM|x64 = Release LDC ARM|x64 Release LDC|Win32 = Release LDC|Win32 Release LDC|x64 = Release LDC|x64 Release OMF|Win32 = Release OMF|Win32 @@ -352,9 +356,14 @@ Global {7610F45A-69D9-4B68-BE63-0E055B51D447}.Debug GDC|Win32.ActiveCfg = Debug|Win32 {7610F45A-69D9-4B68-BE63-0E055B51D447}.Debug GDC|Win32.Build.0 = Debug|Win32 {7610F45A-69D9-4B68-BE63-0E055B51D447}.Debug GDC|x64.ActiveCfg = Debug|Win32 + {7610F45A-69D9-4B68-BE63-0E055B51D447}.Debug LDC ARM|Win32.ActiveCfg = Debug LDC ARM|Win32 + {7610F45A-69D9-4B68-BE63-0E055B51D447}.Debug LDC ARM|Win32.Build.0 = Debug LDC ARM|Win32 + {7610F45A-69D9-4B68-BE63-0E055B51D447}.Debug LDC ARM|x64.ActiveCfg = Debug LDC ARM|x64 + {7610F45A-69D9-4B68-BE63-0E055B51D447}.Debug LDC ARM|x64.Build.0 = Debug LDC ARM|x64 {7610F45A-69D9-4B68-BE63-0E055B51D447}.Debug LDC|Win32.ActiveCfg = Debug LDC|Win32 {7610F45A-69D9-4B68-BE63-0E055B51D447}.Debug LDC|Win32.Build.0 = Debug LDC|Win32 - {7610F45A-69D9-4B68-BE63-0E055B51D447}.Debug LDC|x64.ActiveCfg = Debug|Win32 + {7610F45A-69D9-4B68-BE63-0E055B51D447}.Debug LDC|x64.ActiveCfg = Debug LDC|x64 + {7610F45A-69D9-4B68-BE63-0E055B51D447}.Debug LDC|x64.Build.0 = Debug LDC|x64 {7610F45A-69D9-4B68-BE63-0E055B51D447}.Debug OMF|Win32.ActiveCfg = Debug|Win32 {7610F45A-69D9-4B68-BE63-0E055B51D447}.Debug OMF|Win32.Build.0 = Debug|Win32 {7610F45A-69D9-4B68-BE63-0E055B51D447}.Debug OMF|x64.ActiveCfg = Debug|Win32 @@ -365,6 +374,10 @@ Global {7610F45A-69D9-4B68-BE63-0E055B51D447}.Release COFF32|Win32.Build.0 = Release COFF32|Win32 {7610F45A-69D9-4B68-BE63-0E055B51D447}.Release COFF32|x64.ActiveCfg = Release COFF32|x64 {7610F45A-69D9-4B68-BE63-0E055B51D447}.Release COFF32|x64.Build.0 = Release COFF32|x64 + {7610F45A-69D9-4B68-BE63-0E055B51D447}.Release LDC ARM|Win32.ActiveCfg = Debug LDC ARM|Win32 + {7610F45A-69D9-4B68-BE63-0E055B51D447}.Release LDC ARM|Win32.Build.0 = Debug LDC ARM|Win32 + {7610F45A-69D9-4B68-BE63-0E055B51D447}.Release LDC ARM|x64.ActiveCfg = Release LDC ARM|x64 + {7610F45A-69D9-4B68-BE63-0E055B51D447}.Release LDC ARM|x64.Build.0 = Release LDC ARM|x64 {7610F45A-69D9-4B68-BE63-0E055B51D447}.Release LDC|Win32.ActiveCfg = Release LDC|Win32 {7610F45A-69D9-4B68-BE63-0E055B51D447}.Release LDC|Win32.Build.0 = Release LDC|Win32 {7610F45A-69D9-4B68-BE63-0E055B51D447}.Release LDC|x64.ActiveCfg = Release LDC|x64 @@ -388,6 +401,10 @@ Global {32872753-4812-40DA-9B24-1C2114621E78}.Debug GDC|Win32.Build.0 = Debug GDC|Win32 {32872753-4812-40DA-9B24-1C2114621E78}.Debug GDC|x64.ActiveCfg = Debug GDC|x64 {32872753-4812-40DA-9B24-1C2114621E78}.Debug GDC|x64.Build.0 = Debug GDC|x64 + {32872753-4812-40DA-9B24-1C2114621E78}.Debug LDC ARM|Win32.ActiveCfg = Debug LDC ARM|Win32 + {32872753-4812-40DA-9B24-1C2114621E78}.Debug LDC ARM|Win32.Build.0 = Debug LDC ARM|Win32 + {32872753-4812-40DA-9B24-1C2114621E78}.Debug LDC ARM|x64.ActiveCfg = Debug LDC ARM|x64 + {32872753-4812-40DA-9B24-1C2114621E78}.Debug LDC ARM|x64.Build.0 = Debug LDC ARM|x64 {32872753-4812-40DA-9B24-1C2114621E78}.Debug LDC|Win32.ActiveCfg = Debug LDC|Win32 {32872753-4812-40DA-9B24-1C2114621E78}.Debug LDC|Win32.Build.0 = Debug LDC|Win32 {32872753-4812-40DA-9B24-1C2114621E78}.Debug LDC|x64.ActiveCfg = Debug LDC|x64 @@ -404,6 +421,10 @@ Global {32872753-4812-40DA-9B24-1C2114621E78}.Release COFF32|Win32.Build.0 = Release COFF32|Win32 {32872753-4812-40DA-9B24-1C2114621E78}.Release COFF32|x64.ActiveCfg = Release COFF32|x64 {32872753-4812-40DA-9B24-1C2114621E78}.Release COFF32|x64.Build.0 = Release COFF32|x64 + {32872753-4812-40DA-9B24-1C2114621E78}.Release LDC ARM|Win32.ActiveCfg = Debug LDC ARM|Win32 + {32872753-4812-40DA-9B24-1C2114621E78}.Release LDC ARM|Win32.Build.0 = Debug LDC ARM|Win32 + {32872753-4812-40DA-9B24-1C2114621E78}.Release LDC ARM|x64.ActiveCfg = Release LDC ARM|x64 + {32872753-4812-40DA-9B24-1C2114621E78}.Release LDC ARM|x64.Build.0 = Release LDC ARM|x64 {32872753-4812-40DA-9B24-1C2114621E78}.Release LDC|Win32.ActiveCfg = Release LDC|Win32 {32872753-4812-40DA-9B24-1C2114621E78}.Release LDC|Win32.Build.0 = Release LDC|Win32 {32872753-4812-40DA-9B24-1C2114621E78}.Release LDC|x64.ActiveCfg = Release LDC|x64 @@ -432,10 +453,14 @@ Global {8760F45A-69D9-4B68-BE63-0E055B51D447}.Debug GDC|Win32.Build.0 = Debug GDC|Win32 {8760F45A-69D9-4B68-BE63-0E055B51D447}.Debug GDC|x64.ActiveCfg = Debug GDC|x64 {8760F45A-69D9-4B68-BE63-0E055B51D447}.Debug GDC|x64.Build.0 = Debug GDC|x64 + {8760F45A-69D9-4B68-BE63-0E055B51D447}.Debug LDC ARM|Win32.ActiveCfg = Debug LDC|Win32 + {8760F45A-69D9-4B68-BE63-0E055B51D447}.Debug LDC ARM|Win32.Build.0 = Debug LDC|Win32 + {8760F45A-69D9-4B68-BE63-0E055B51D447}.Debug LDC ARM|x64.ActiveCfg = Debug LDC|x64 + {8760F45A-69D9-4B68-BE63-0E055B51D447}.Debug LDC ARM|x64.Build.0 = Debug LDC|x64 {8760F45A-69D9-4B68-BE63-0E055B51D447}.Debug LDC|Win32.ActiveCfg = Debug LDC|Win32 {8760F45A-69D9-4B68-BE63-0E055B51D447}.Debug LDC|Win32.Build.0 = Debug LDC|Win32 - {8760F45A-69D9-4B68-BE63-0E055B51D447}.Debug LDC|x64.ActiveCfg = Debug COFF32|Win32 - {8760F45A-69D9-4B68-BE63-0E055B51D447}.Debug LDC|x64.Build.0 = Debug COFF32|Win32 + {8760F45A-69D9-4B68-BE63-0E055B51D447}.Debug LDC|x64.ActiveCfg = Debug LDC|x64 + {8760F45A-69D9-4B68-BE63-0E055B51D447}.Debug LDC|x64.Build.0 = Debug LDC|x64 {8760F45A-69D9-4B68-BE63-0E055B51D447}.Debug OMF|Win32.ActiveCfg = Debug|Win32 {8760F45A-69D9-4B68-BE63-0E055B51D447}.Debug OMF|Win32.Build.0 = Debug|Win32 {8760F45A-69D9-4B68-BE63-0E055B51D447}.Debug OMF|x64.ActiveCfg = Debug|x64 @@ -448,6 +473,10 @@ Global {8760F45A-69D9-4B68-BE63-0E055B51D447}.Release COFF32|Win32.Build.0 = Release COFF32|Win32 {8760F45A-69D9-4B68-BE63-0E055B51D447}.Release COFF32|x64.ActiveCfg = Release COFF32|x64 {8760F45A-69D9-4B68-BE63-0E055B51D447}.Release COFF32|x64.Build.0 = Release COFF32|x64 + {8760F45A-69D9-4B68-BE63-0E055B51D447}.Release LDC ARM|Win32.ActiveCfg = Debug LDC|Win32 + {8760F45A-69D9-4B68-BE63-0E055B51D447}.Release LDC ARM|Win32.Build.0 = Debug LDC|Win32 + {8760F45A-69D9-4B68-BE63-0E055B51D447}.Release LDC ARM|x64.ActiveCfg = Release LDC|x64 + {8760F45A-69D9-4B68-BE63-0E055B51D447}.Release LDC ARM|x64.Build.0 = Release LDC|x64 {8760F45A-69D9-4B68-BE63-0E055B51D447}.Release LDC|Win32.ActiveCfg = Release LDC|Win32 {8760F45A-69D9-4B68-BE63-0E055B51D447}.Release LDC|Win32.Build.0 = Release LDC|Win32 {8760F45A-69D9-4B68-BE63-0E055B51D447}.Release LDC|x64.ActiveCfg = Release LDC|x64 @@ -475,6 +504,10 @@ Global {FE3A959D-6CFA-43BF-8637-62125B571770}.Debug GDC|Win32.Build.0 = Debug GDC|Win32 {FE3A959D-6CFA-43BF-8637-62125B571770}.Debug GDC|x64.ActiveCfg = Debug GDC|x64 {FE3A959D-6CFA-43BF-8637-62125B571770}.Debug GDC|x64.Build.0 = Debug GDC|x64 + {FE3A959D-6CFA-43BF-8637-62125B571770}.Debug LDC ARM|Win32.ActiveCfg = Debug LDC ARM|Win32 + {FE3A959D-6CFA-43BF-8637-62125B571770}.Debug LDC ARM|Win32.Build.0 = Debug LDC ARM|Win32 + {FE3A959D-6CFA-43BF-8637-62125B571770}.Debug LDC ARM|x64.ActiveCfg = Debug LDC ARM|x64 + {FE3A959D-6CFA-43BF-8637-62125B571770}.Debug LDC ARM|x64.Build.0 = Debug LDC ARM|x64 {FE3A959D-6CFA-43BF-8637-62125B571770}.Debug LDC|Win32.ActiveCfg = Debug LDC|Win32 {FE3A959D-6CFA-43BF-8637-62125B571770}.Debug LDC|Win32.Build.0 = Debug LDC|Win32 {FE3A959D-6CFA-43BF-8637-62125B571770}.Debug LDC|x64.ActiveCfg = Debug LDC|x64 @@ -491,6 +524,10 @@ Global {FE3A959D-6CFA-43BF-8637-62125B571770}.Release COFF32|Win32.Build.0 = Release COFF32|Win32 {FE3A959D-6CFA-43BF-8637-62125B571770}.Release COFF32|x64.ActiveCfg = Release COFF32|x64 {FE3A959D-6CFA-43BF-8637-62125B571770}.Release COFF32|x64.Build.0 = Release COFF32|x64 + {FE3A959D-6CFA-43BF-8637-62125B571770}.Release LDC ARM|Win32.ActiveCfg = Debug LDC ARM|Win32 + {FE3A959D-6CFA-43BF-8637-62125B571770}.Release LDC ARM|Win32.Build.0 = Debug LDC ARM|Win32 + {FE3A959D-6CFA-43BF-8637-62125B571770}.Release LDC ARM|x64.ActiveCfg = Release LDC ARM|x64 + {FE3A959D-6CFA-43BF-8637-62125B571770}.Release LDC ARM|x64.Build.0 = Release LDC ARM|x64 {FE3A959D-6CFA-43BF-8637-62125B571770}.Release LDC|Win32.ActiveCfg = Release LDC|Win32 {FE3A959D-6CFA-43BF-8637-62125B571770}.Release LDC|Win32.Build.0 = Release LDC|Win32 {FE3A959D-6CFA-43BF-8637-62125B571770}.Release LDC|x64.ActiveCfg = Release LDC|x64 @@ -518,6 +555,10 @@ Global {2070DF9A-6D80-4E3C-950A-C1BBA1B20F4D}.Debug GDC|Win32.Build.0 = Debug GDC|Win32 {2070DF9A-6D80-4E3C-950A-C1BBA1B20F4D}.Debug GDC|x64.ActiveCfg = Debug GDC|x64 {2070DF9A-6D80-4E3C-950A-C1BBA1B20F4D}.Debug GDC|x64.Build.0 = Debug GDC|x64 + {2070DF9A-6D80-4E3C-950A-C1BBA1B20F4D}.Debug LDC ARM|Win32.ActiveCfg = Debug LDC ARM|Win32 + {2070DF9A-6D80-4E3C-950A-C1BBA1B20F4D}.Debug LDC ARM|Win32.Build.0 = Debug LDC ARM|Win32 + {2070DF9A-6D80-4E3C-950A-C1BBA1B20F4D}.Debug LDC ARM|x64.ActiveCfg = Debug LDC ARM|x64 + {2070DF9A-6D80-4E3C-950A-C1BBA1B20F4D}.Debug LDC ARM|x64.Build.0 = Debug LDC ARM|x64 {2070DF9A-6D80-4E3C-950A-C1BBA1B20F4D}.Debug LDC|Win32.ActiveCfg = Debug LDC|Win32 {2070DF9A-6D80-4E3C-950A-C1BBA1B20F4D}.Debug LDC|Win32.Build.0 = Debug LDC|Win32 {2070DF9A-6D80-4E3C-950A-C1BBA1B20F4D}.Debug LDC|x64.ActiveCfg = Debug LDC|x64 @@ -534,6 +575,10 @@ Global {2070DF9A-6D80-4E3C-950A-C1BBA1B20F4D}.Release COFF32|Win32.Build.0 = Release COFF32|Win32 {2070DF9A-6D80-4E3C-950A-C1BBA1B20F4D}.Release COFF32|x64.ActiveCfg = Release COFF32|x64 {2070DF9A-6D80-4E3C-950A-C1BBA1B20F4D}.Release COFF32|x64.Build.0 = Release COFF32|x64 + {2070DF9A-6D80-4E3C-950A-C1BBA1B20F4D}.Release LDC ARM|Win32.ActiveCfg = Debug LDC ARM|Win32 + {2070DF9A-6D80-4E3C-950A-C1BBA1B20F4D}.Release LDC ARM|Win32.Build.0 = Debug LDC ARM|Win32 + {2070DF9A-6D80-4E3C-950A-C1BBA1B20F4D}.Release LDC ARM|x64.ActiveCfg = Release LDC ARM|x64 + {2070DF9A-6D80-4E3C-950A-C1BBA1B20F4D}.Release LDC ARM|x64.Build.0 = Release LDC ARM|x64 {2070DF9A-6D80-4E3C-950A-C1BBA1B20F4D}.Release LDC|Win32.ActiveCfg = Release LDC|Win32 {2070DF9A-6D80-4E3C-950A-C1BBA1B20F4D}.Release LDC|Win32.Build.0 = Release LDC|Win32 {2070DF9A-6D80-4E3C-950A-C1BBA1B20F4D}.Release LDC|x64.ActiveCfg = Release LDC|x64 @@ -562,10 +607,14 @@ Global {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Debug GDC|Win32.Build.0 = Debug GDC|Win32 {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Debug GDC|x64.ActiveCfg = Debug GDC|x64 {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Debug GDC|x64.Build.0 = Debug GDC|x64 + {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Debug LDC ARM|Win32.ActiveCfg = Debug LDC ARM|Win32 + {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Debug LDC ARM|Win32.Build.0 = Debug LDC ARM|Win32 + {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Debug LDC ARM|x64.ActiveCfg = Debug LDC ARM|x64 + {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Debug LDC ARM|x64.Build.0 = Debug LDC ARM|x64 {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Debug LDC|Win32.ActiveCfg = Debug LDC|Win32 {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Debug LDC|Win32.Build.0 = Debug LDC|Win32 - {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Debug LDC|x64.ActiveCfg = Debug COFF32|Win32 - {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Debug LDC|x64.Build.0 = Debug COFF32|Win32 + {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Debug LDC|x64.ActiveCfg = Debug LDC|x64 + {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Debug LDC|x64.Build.0 = Debug LDC|x64 {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Debug OMF|Win32.ActiveCfg = Debug|Win32 {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Debug OMF|Win32.Build.0 = Debug|Win32 {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Debug OMF|x64.ActiveCfg = Debug|x64 @@ -578,6 +627,10 @@ Global {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Release COFF32|Win32.Build.0 = Release COFF32|Win32 {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Release COFF32|x64.ActiveCfg = Release COFF32|x64 {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Release COFF32|x64.Build.0 = Release COFF32|x64 + {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Release LDC ARM|Win32.ActiveCfg = Debug LDC ARM|Win32 + {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Release LDC ARM|Win32.Build.0 = Debug LDC ARM|Win32 + {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Release LDC ARM|x64.ActiveCfg = Release LDC ARM|x64 + {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Release LDC ARM|x64.Build.0 = Release LDC ARM|x64 {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Release LDC|Win32.ActiveCfg = Release LDC|Win32 {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Release LDC|Win32.Build.0 = Release LDC|Win32 {E2073B79-635A-48FA-A5A3-6E760D3A5DD8}.Release LDC|x64.ActiveCfg = Release LDC|x64 @@ -604,6 +657,10 @@ Global {E2073B79-635A-48FA-A5A3-6E500D3A5DD8}.Debug GDC|Win32.Build.0 = Debug GDC|Win32 {E2073B79-635A-48FA-A5A3-6E500D3A5DD8}.Debug GDC|x64.ActiveCfg = Debug GDC|x64 {E2073B79-635A-48FA-A5A3-6E500D3A5DD8}.Debug GDC|x64.Build.0 = Debug GDC|x64 + {E2073B79-635A-48FA-A5A3-6E500D3A5DD8}.Debug LDC ARM|Win32.ActiveCfg = Debug LDC|Win32 + {E2073B79-635A-48FA-A5A3-6E500D3A5DD8}.Debug LDC ARM|Win32.Build.0 = Debug LDC|Win32 + {E2073B79-635A-48FA-A5A3-6E500D3A5DD8}.Debug LDC ARM|x64.ActiveCfg = Debug LDC ARM|x64 + {E2073B79-635A-48FA-A5A3-6E500D3A5DD8}.Debug LDC ARM|x64.Build.0 = Debug LDC ARM|x64 {E2073B79-635A-48FA-A5A3-6E500D3A5DD8}.Debug LDC|Win32.ActiveCfg = Debug LDC|Win32 {E2073B79-635A-48FA-A5A3-6E500D3A5DD8}.Debug LDC|Win32.Build.0 = Debug LDC|Win32 {E2073B79-635A-48FA-A5A3-6E500D3A5DD8}.Debug LDC|x64.ActiveCfg = Debug LDC|x64 @@ -620,6 +677,10 @@ Global {E2073B79-635A-48FA-A5A3-6E500D3A5DD8}.Release COFF32|Win32.Build.0 = Release COFF32|Win32 {E2073B79-635A-48FA-A5A3-6E500D3A5DD8}.Release COFF32|x64.ActiveCfg = Release COFF32|x64 {E2073B79-635A-48FA-A5A3-6E500D3A5DD8}.Release COFF32|x64.Build.0 = Release COFF32|x64 + {E2073B79-635A-48FA-A5A3-6E500D3A5DD8}.Release LDC ARM|Win32.ActiveCfg = Debug LDC|Win32 + {E2073B79-635A-48FA-A5A3-6E500D3A5DD8}.Release LDC ARM|Win32.Build.0 = Debug LDC|Win32 + {E2073B79-635A-48FA-A5A3-6E500D3A5DD8}.Release LDC ARM|x64.ActiveCfg = Release LDC ARM|x64 + {E2073B79-635A-48FA-A5A3-6E500D3A5DD8}.Release LDC ARM|x64.Build.0 = Release LDC ARM|x64 {E2073B79-635A-48FA-A5A3-6E500D3A5DD8}.Release LDC|Win32.ActiveCfg = Release LDC|Win32 {E2073B79-635A-48FA-A5A3-6E500D3A5DD8}.Release LDC|Win32.Build.0 = Release LDC|Win32 {E2073B79-635A-48FA-A5A3-6E500D3A5DD8}.Release LDC|x64.ActiveCfg = Release LDC|x64 @@ -644,6 +705,10 @@ Global {2F75431E-B8DB-4231-AAC1-EA68D06A22E6}.Debug GDC|Win32.Build.0 = Debug GDC|Win32 {2F75431E-B8DB-4231-AAC1-EA68D06A22E6}.Debug GDC|x64.ActiveCfg = Debug GDC|x64 {2F75431E-B8DB-4231-AAC1-EA68D06A22E6}.Debug GDC|x64.Build.0 = Debug GDC|x64 + {2F75431E-B8DB-4231-AAC1-EA68D06A22E6}.Debug LDC ARM|Win32.ActiveCfg = Debug LDC ARM|Win32 + {2F75431E-B8DB-4231-AAC1-EA68D06A22E6}.Debug LDC ARM|Win32.Build.0 = Debug LDC ARM|Win32 + {2F75431E-B8DB-4231-AAC1-EA68D06A22E6}.Debug LDC ARM|x64.ActiveCfg = Debug LDC ARM|x64 + {2F75431E-B8DB-4231-AAC1-EA68D06A22E6}.Debug LDC ARM|x64.Build.0 = Debug LDC ARM|x64 {2F75431E-B8DB-4231-AAC1-EA68D06A22E6}.Debug LDC|Win32.ActiveCfg = Debug LDC|Win32 {2F75431E-B8DB-4231-AAC1-EA68D06A22E6}.Debug LDC|Win32.Build.0 = Debug LDC|Win32 {2F75431E-B8DB-4231-AAC1-EA68D06A22E6}.Debug LDC|x64.ActiveCfg = Debug LDC|x64 @@ -660,6 +725,10 @@ Global {2F75431E-B8DB-4231-AAC1-EA68D06A22E6}.Release COFF32|Win32.Build.0 = Release COFF32|Win32 {2F75431E-B8DB-4231-AAC1-EA68D06A22E6}.Release COFF32|x64.ActiveCfg = Release COFF32|x64 {2F75431E-B8DB-4231-AAC1-EA68D06A22E6}.Release COFF32|x64.Build.0 = Release COFF32|x64 + {2F75431E-B8DB-4231-AAC1-EA68D06A22E6}.Release LDC ARM|Win32.ActiveCfg = Debug LDC ARM|Win32 + {2F75431E-B8DB-4231-AAC1-EA68D06A22E6}.Release LDC ARM|Win32.Build.0 = Debug LDC ARM|Win32 + {2F75431E-B8DB-4231-AAC1-EA68D06A22E6}.Release LDC ARM|x64.ActiveCfg = Release LDC ARM|x64 + {2F75431E-B8DB-4231-AAC1-EA68D06A22E6}.Release LDC ARM|x64.Build.0 = Release LDC ARM|x64 {2F75431E-B8DB-4231-AAC1-EA68D06A22E6}.Release LDC|Win32.ActiveCfg = Release LDC|Win32 {2F75431E-B8DB-4231-AAC1-EA68D06A22E6}.Release LDC|Win32.Build.0 = Release LDC|Win32 {2F75431E-B8DB-4231-AAC1-EA68D06A22E6}.Release LDC|x64.ActiveCfg = Release LDC|x64 @@ -685,10 +754,14 @@ Global {CD26A145-F663-473D-8908-0254FE377D48}.Debug GDC|Win32.ActiveCfg = Debug|Win32 {CD26A145-F663-473D-8908-0254FE377D48}.Debug GDC|Win32.Build.0 = Debug|Win32 {CD26A145-F663-473D-8908-0254FE377D48}.Debug GDC|x64.ActiveCfg = Debug|Win32 + {CD26A145-F663-473D-8908-0254FE377D48}.Debug LDC ARM|Win32.ActiveCfg = Debug LDC ARM|Win32 + {CD26A145-F663-473D-8908-0254FE377D48}.Debug LDC ARM|Win32.Build.0 = Debug LDC ARM|Win32 + {CD26A145-F663-473D-8908-0254FE377D48}.Debug LDC ARM|x64.ActiveCfg = Debug LDC|x64 + {CD26A145-F663-473D-8908-0254FE377D48}.Debug LDC ARM|x64.Build.0 = Debug LDC|x64 {CD26A145-F663-473D-8908-0254FE377D48}.Debug LDC|Win32.ActiveCfg = Debug|Win32 {CD26A145-F663-473D-8908-0254FE377D48}.Debug LDC|Win32.Build.0 = Debug|Win32 - {CD26A145-F663-473D-8908-0254FE377D48}.Debug LDC|x64.ActiveCfg = Debug COFF32|Win32 - {CD26A145-F663-473D-8908-0254FE377D48}.Debug LDC|x64.Build.0 = Debug COFF32|Win32 + {CD26A145-F663-473D-8908-0254FE377D48}.Debug LDC|x64.ActiveCfg = Debug LDC|x64 + {CD26A145-F663-473D-8908-0254FE377D48}.Debug LDC|x64.Build.0 = Debug LDC|x64 {CD26A145-F663-473D-8908-0254FE377D48}.Debug OMF|Win32.ActiveCfg = Debug|Win32 {CD26A145-F663-473D-8908-0254FE377D48}.Debug OMF|Win32.Build.0 = Debug|Win32 {CD26A145-F663-473D-8908-0254FE377D48}.Debug OMF|x64.ActiveCfg = Debug|Win32 @@ -699,6 +772,10 @@ Global {CD26A145-F663-473D-8908-0254FE377D48}.Release COFF32|Win32.Build.0 = Release COFF32|Win32 {CD26A145-F663-473D-8908-0254FE377D48}.Release COFF32|x64.ActiveCfg = Release COFF32|x64 {CD26A145-F663-473D-8908-0254FE377D48}.Release COFF32|x64.Build.0 = Release COFF32|x64 + {CD26A145-F663-473D-8908-0254FE377D48}.Release LDC ARM|Win32.ActiveCfg = Debug LDC ARM|Win32 + {CD26A145-F663-473D-8908-0254FE377D48}.Release LDC ARM|Win32.Build.0 = Debug LDC ARM|Win32 + {CD26A145-F663-473D-8908-0254FE377D48}.Release LDC ARM|x64.ActiveCfg = Release LDC|x64 + {CD26A145-F663-473D-8908-0254FE377D48}.Release LDC ARM|x64.Build.0 = Release LDC|x64 {CD26A145-F663-473D-8908-0254FE377D48}.Release LDC|Win32.ActiveCfg = Release LDC|Win32 {CD26A145-F663-473D-8908-0254FE377D48}.Release LDC|Win32.Build.0 = Release LDC|Win32 {CD26A145-F663-473D-8908-0254FE377D48}.Release LDC|x64.ActiveCfg = Release COFF32|x64 @@ -723,6 +800,10 @@ Global {34289BD7-AB7E-4264-B146-8139DDE9F0BF}.Debug GDC|Win32.Build.0 = Debug|Win32 {34289BD7-AB7E-4264-B146-8139DDE9F0BF}.Debug GDC|x64.ActiveCfg = Debug|x64 {34289BD7-AB7E-4264-B146-8139DDE9F0BF}.Debug GDC|x64.Build.0 = Debug|x64 + {34289BD7-AB7E-4264-B146-8139DDE9F0BF}.Debug LDC ARM|Win32.ActiveCfg = Debug LDC ARM|Win32 + {34289BD7-AB7E-4264-B146-8139DDE9F0BF}.Debug LDC ARM|Win32.Build.0 = Debug LDC ARM|Win32 + {34289BD7-AB7E-4264-B146-8139DDE9F0BF}.Debug LDC ARM|x64.ActiveCfg = Debug LDC ARM|x64 + {34289BD7-AB7E-4264-B146-8139DDE9F0BF}.Debug LDC ARM|x64.Build.0 = Debug LDC ARM|x64 {34289BD7-AB7E-4264-B146-8139DDE9F0BF}.Debug LDC|Win32.ActiveCfg = Debug|Win32 {34289BD7-AB7E-4264-B146-8139DDE9F0BF}.Debug LDC|Win32.Build.0 = Debug|Win32 {34289BD7-AB7E-4264-B146-8139DDE9F0BF}.Debug LDC|x64.ActiveCfg = Debug LDC|x64 @@ -739,6 +820,10 @@ Global {34289BD7-AB7E-4264-B146-8139DDE9F0BF}.Release COFF32|Win32.Build.0 = Release COFF32|Win32 {34289BD7-AB7E-4264-B146-8139DDE9F0BF}.Release COFF32|x64.ActiveCfg = Release COFF32|x64 {34289BD7-AB7E-4264-B146-8139DDE9F0BF}.Release COFF32|x64.Build.0 = Release COFF32|x64 + {34289BD7-AB7E-4264-B146-8139DDE9F0BF}.Release LDC ARM|Win32.ActiveCfg = Debug LDC ARM|Win32 + {34289BD7-AB7E-4264-B146-8139DDE9F0BF}.Release LDC ARM|Win32.Build.0 = Debug LDC ARM|Win32 + {34289BD7-AB7E-4264-B146-8139DDE9F0BF}.Release LDC ARM|x64.ActiveCfg = Release LDC ARM|x64 + {34289BD7-AB7E-4264-B146-8139DDE9F0BF}.Release LDC ARM|x64.Build.0 = Release LDC ARM|x64 {34289BD7-AB7E-4264-B146-8139DDE9F0BF}.Release LDC|Win32.ActiveCfg = Release LDC|Win32 {34289BD7-AB7E-4264-B146-8139DDE9F0BF}.Release LDC|Win32.Build.0 = Release LDC|Win32 {34289BD7-AB7E-4264-B146-8139DDE9F0BF}.Release LDC|x64.ActiveCfg = Release LDC|x64 @@ -767,10 +852,14 @@ Global {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Debug GDC|Win32.Build.0 = Debug|Win32 {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Debug GDC|x64.ActiveCfg = Debug|x64 {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Debug GDC|x64.Build.0 = Debug|x64 + {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Debug LDC ARM|Win32.ActiveCfg = Debug LDC ARM|Win32 + {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Debug LDC ARM|Win32.Build.0 = Debug LDC ARM|Win32 + {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Debug LDC ARM|x64.ActiveCfg = Debug LDC ARM|x64 + {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Debug LDC ARM|x64.Build.0 = Debug LDC ARM|x64 {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Debug LDC|Win32.ActiveCfg = Debug|Win32 {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Debug LDC|Win32.Build.0 = Debug|Win32 - {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Debug LDC|x64.ActiveCfg = Debug|x64 - {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Debug LDC|x64.Build.0 = Debug|x64 + {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Debug LDC|x64.ActiveCfg = Debug LDC|x64 + {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Debug LDC|x64.Build.0 = Debug LDC|x64 {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Debug OMF|Win32.ActiveCfg = Debug|Win32 {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Debug OMF|Win32.Build.0 = Debug|Win32 {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Debug OMF|x64.ActiveCfg = Debug|x64 @@ -783,6 +872,10 @@ Global {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Release COFF32|Win32.Build.0 = Release COFF32|Win32 {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Release COFF32|x64.ActiveCfg = Release COFF32|x64 {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Release COFF32|x64.Build.0 = Release COFF32|x64 + {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Release LDC ARM|Win32.ActiveCfg = Debug LDC ARM|Win32 + {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Release LDC ARM|Win32.Build.0 = Debug LDC ARM|Win32 + {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Release LDC ARM|x64.ActiveCfg = Release LDC ARM|x64 + {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Release LDC ARM|x64.Build.0 = Release LDC ARM|x64 {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Release LDC|Win32.ActiveCfg = Release|Win32 {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Release LDC|Win32.Build.0 = Release|Win32 {8EC6179A-7BBA-4555-B384-3B19D3BB7028}.Release LDC|x64.ActiveCfg = Release LDC|x64