2929
3030; define DMD source path to include dmd installation
3131; !define DMD
32- !define DMD_VERSION " 2.110 .0"
32+ !define DMD_VERSION " 2.111 .0"
3333!define DMD_SRC c:\d\dmd-${DMD_VERSION}
3434
3535; define LDC to include ldc installation
3636; !define LDC
37- !define LDC_VERSION " 1.40.0 "
37+ !define LDC_VERSION " 1.40.1 "
3838!define LDC_SRC c:\d\ldc2-${LDC_VERSION} -windows-multilib
3939
4040; define VS2019 to include VS2019 support
@@ -387,7 +387,7 @@ ${MementoSection} "Install DMD" SecDMD
387387 !define DmdBaseDir " $CompilerInstallDir\dmd-${DMD_VERSION}"
388388 ${SetOutPath} " ${DmdBaseDir}"
389389 File /r ${DMD_SRC} \html
390- File /r ${DMD_SRC} \samples
390+ ; File /r ${DMD_SRC}\samples
391391 File /r ${DMD_SRC} \src
392392 File /r ${DMD_SRC} \windows
393393 File ${DMD_SRC} \license .txt
@@ -745,6 +745,8 @@ ${MementoSectionEnd}
745745!endif
746746
747747!macro RegisterPlatform Vxxx Platform
748+ !define UniqueID ${__LINE__}
749+ IfFileExists ' ${Vxxx}\Platforms\${Platform}' +1 NoPlatformDir_${UniqueID}
748750 ${SetOutPath} " ${Vxxx}\Platforms\${Platform}\ImportBefore\Default"
749751 ${File} ..\msbuild\ImportBefore\Default\ d.props
750752 ${SetOutPath} " ${Vxxx}\Platforms\${Platform}\ImportBefore"
@@ -754,6 +756,8 @@ ${MementoSectionEnd}
754756 ${SetOutPath} " ${Vxxx}\Platforms\${Platform}\ImportAfter"
755757 ${File} ..\msbuild\ImportAfter\ d.targets
756758 ${File} ..\msbuild\ImportAfter\ general_d.targets
759+ NoPlatformDir_${UniqueID} :
760+ !undef UniqueID
757761!macroend
758762!define RegisterPlatform " !insertmacro RegisterPlatform"
759763
@@ -792,6 +796,7 @@ ${MementoSection} "MSBuild integration" SecMSBuild
792796 StrCmp $1 " " NoVS2022
793797 ${RegisterPlatform} " $1\MsBuild\Microsoft\VC\v170" " x64"
794798 ${RegisterPlatform} " $1\MsBuild\Microsoft\VC\v170" " Win32"
799+ ${RegisterPlatform} " $1\MsBuild\Microsoft\VC\v170" " ARM64"
795800 ${RegisterIcons} " 17.0"
796801
797802 !define V170_GENERAL_XML " $1\MsBuild\Microsoft\VC\v170\1033\general.xml"
@@ -809,6 +814,7 @@ ${MementoSection} "MSBuild integration" SecMSBuild
809814 StrCmp $1 " " NoVS2022_2
810815 ${RegisterPlatform} " $1\MsBuild\Microsoft\VC\v170" " x64"
811816 ${RegisterPlatform} " $1\MsBuild\Microsoft\VC\v170" " Win32"
817+ ${RegisterPlatform} " $1\MsBuild\Microsoft\VC\v170" " ARM64"
812818 ${RegisterIcons} " 17.0"
813819
814820 !define V170_GENERAL_XML_2 " $1\MsBuild\Microsoft\VC\v170\1033\general.xml"
@@ -826,6 +832,7 @@ ${MementoSection} "MSBuild integration" SecMSBuild
826832 StrCmp $1 " " NoVS2022_3
827833 ${RegisterPlatform} " $1\MsBuild\Microsoft\VC\v170" " x64"
828834 ${RegisterPlatform} " $1\MsBuild\Microsoft\VC\v170" " Win32"
835+ ${RegisterPlatform} " $1\MsBuild\Microsoft\VC\v170" " ARM64"
829836 ${RegisterIcons} " 17.0"
830837
831838 !define V170_GENERAL_XML_3 " $1\MsBuild\Microsoft\VC\v170\1033\general.xml"
@@ -843,6 +850,7 @@ ${MementoSection} "MSBuild integration" SecMSBuild
843850 StrCmp $1 " " NoVS2022_4
844851 ${RegisterPlatform} " $1\MsBuild\Microsoft\VC\v170" " x64"
845852 ${RegisterPlatform} " $1\MsBuild\Microsoft\VC\v170" " Win32"
853+ ${RegisterPlatform} " $1\MsBuild\Microsoft\VC\v170" " ARM64"
846854 ${RegisterIcons} " 17.0"
847855
848856 !define V170_GENERAL_XML_4 " $1\MsBuild\Microsoft\VC\v170\1033\general.xml"
@@ -859,6 +867,7 @@ ${MementoSection} "MSBuild integration" SecMSBuild
859867 StrCmp $1 " " NoVS2022BT
860868 ${RegisterPlatform} " $1\Common7\IDE\VC\VCTargets" " x64"
861869 ${RegisterPlatform} " $1\Common7\IDE\VC\VCTargets" " Win32"
870+ ${RegisterPlatform} " $1\Common7\IDE\VC\VCTargets" " ARM64"
862871 ${RegisterIcons} " 17.0"
863872
864873 !define V170BT_GENERAL_XML " $1\Common7\IDE\VC\VCTargets\1033\general.xml"
0 commit comments