2424# update the following variables to match the installation
2525# paths on your system or pass on the command line to nmake
2626
27- NSIS = $(PROGRAMFILES ) \NSIS
27+ # nmake doesn't like $(ProgramFiles(x86)), so run this with x86 nmake
28+ PROGRAMFILESX86 = c:\Program Files (x86)
29+
30+ NSIS = $(PROGRAMFILESX86 ) \NSIS
2831MSBUILD = msbuild
29- MSBUILD15 = "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild"
32+ MSBUILD15 = "c:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild"
33+ !IF !EXIST($(MSBUILD15))
34+ MSBUILD15 = "c:\Program Files (x86)\Microsoft Visual Studio\2019\Preview\MSBuild\Current\Bin\msbuild"
35+ !ENDIF
3036CONFIG = Release COFF32
3137
3238# #############################################################
@@ -61,8 +67,8 @@ dparser_test:
6167
6268fake_dparser :
6369 if not exist bin\R elease\D ParserCOMServer\n ul md bin\R elease\D ParserCOMServer
64- if exist " $( PROGRAMFILES ) \VisualD\dparser\dparser\DParserCOMServer.exe" copy " $( PROGRAMFILES ) \VisualD\dparser\dparser\DParserCOMServer.exe" bin\R elease\D ParserCOMServer
65- if exist " $( PROGRAMFILES ) \VisualD\dparser\dparser\D_Parser.dll" copy " $( PROGRAMFILES ) \VisualD\dparser\dparser\D_Parser.dll" bin\R elease\D ParserCOMServer
70+ if exist " $( PROGRAMFILESX86 ) \VisualD\dparser\dparser\DParserCOMServer.exe" copy " $( PROGRAMFILESX86 ) \VisualD\dparser\dparser\DParserCOMServer.exe" bin\R elease\D ParserCOMServer
71+ if exist " $( PROGRAMFILESX86 ) \VisualD\dparser\dparser\D_Parser.dll" copy " $( PROGRAMFILESX86 ) \VisualD\dparser\dparser\D_Parser.dll" bin\R elease\D ParserCOMServer
6672 if not exist bin\R elease\D ParserCOMServer\D ParserCOMServer.exe echo dummy > bin\R elease\D ParserCOMServer\D ParserCOMServer.exe
6773 if not exist bin\R elease\D ParserCOMServer\D _Parser.dll echo dummy > bin\R elease\D ParserCOMServer\D _Parser.dll
6874
@@ -78,7 +84,7 @@ dbuild12:
7884
7985fake_dbuild12 :
8086 if not exist msbuild\d build\o bj\r elease\n ul md msbuild\d build\o bj\r elease
81- if exist " $( PROGRAMFILES ) \VisualD\msbuild\dbuild.12.0.dll" copy " $( PROGRAMFILES ) \VisualD\msbuild\dbuild.12.0.dll" msbuild\d build\o bj\r elease
87+ if exist " $( PROGRAMFILESX86 ) \VisualD\msbuild\dbuild.12.0.dll" copy " $( PROGRAMFILESX86 ) \VisualD\msbuild\dbuild.12.0.dll" msbuild\d build\o bj\r elease
8288 if not exist msbuild\d build\o bj\r elease\d build.12.0.dll echo dummy > msbuild\d build\o bj\r elease\d build.12.0.dll
8389
8490dbuild14 :
@@ -87,26 +93,35 @@ dbuild14:
8793
8894fake_dbuild14 :
8995 if not exist msbuild\d build\o bj\r elease-v14\n ul md msbuild\d build\o bj\r elease-v14
90- if exist " $( PROGRAMFILES ) \VisualD\msbuild\dbuild.14.0.dll" copy " $( PROGRAMFILES ) \VisualD\msbuild\dbuild.14.0.dll" msbuild\d build\o bj\r elease-v14
96+ if exist " $( PROGRAMFILESX86 ) \VisualD\msbuild\dbuild.14.0.dll" copy " $( PROGRAMFILESX86 ) \VisualD\msbuild\dbuild.14.0.dll" msbuild\d build\o bj\r elease-v14
9197 if not exist msbuild\d build\o bj\r elease-v14\d build.14.0.dll echo dummy > msbuild\d build\o bj\r elease-v14\d build.14.0.dll
9298
9399dbuild15 :
94100 cd msbuild\d build && devenv /Build " Release-v15|AnyCPU" /Project " dbuild" dbuild.sln
95101
96102fake_dbuild15 :
97103 if not exist msbuild\d build\o bj\r elease-v15\n ul md msbuild\d build\o bj\r elease-v15
98- if exist " $( PROGRAMFILES ) \VisualD\msbuild\dbuild.15.0.dll" copy " $( PROGRAMFILES ) \VisualD\msbuild\dbuild.15.0.dll" msbuild\d build\o bj\r elease-v15
104+ if exist " $( PROGRAMFILESX86 ) \VisualD\msbuild\dbuild.15.0.dll" copy " $( PROGRAMFILESX86 ) \VisualD\msbuild\dbuild.15.0.dll" msbuild\d build\o bj\r elease-v15
99105 if not exist msbuild\d build\o bj\r elease-v15\d build.15.0.dll echo dummy > msbuild\d build\o bj\r elease-v15\d build.15.0.dll
100106
107+ dbuild16 :
108+ cd msbuild\d build && devenv /Build " Release-v16|AnyCPU" /Project " dbuild" dbuild.sln
109+
110+
101111mago :
102112 cd ..\. .\m ago && devenv /Build " Release|Win32" /Project " MagoNatDE" magodbg_2010.sln
103113 cd ..\. .\m ago && devenv /Build " Release|x64" /Project " MagoRemote" magodbg_2010.sln
104114 cd ..\. .\m ago && devenv /Build " Release StaticDE|Win32" /Project " MagoNatCC" magodbg_2010.sln
105115
106116mago_vs15 :
107- cd ..\. .\m ago && msbuild /p:Configuration=Release; Platform=Win32; PlatformToolset=v140 /target:DebugEngine\M agoNatDE MagoDbg_2010.sln
108- cd ..\. .\m ago && msbuild /p:Configuration=Release; Platform=x64; PlatformToolset=v140 /target:DebugEngine\M agoRemote MagoDbg_2010.sln
109- cd ..\. .\m ago && msbuild " /p:Configuration=Release StaticDE;Platform=Win32;PlatformToolset=v140" /target:Expression\M agoNatCC MagoDbg_2010.sln
117+ cd ..\. .\m ago && msbuild /p:Configuration=Release; Platform=Win32; PlatformToolset=v141 /target:DebugEngine\M agoNatDE MagoDbg_2010.sln
118+ cd ..\. .\m ago && msbuild /p:Configuration=Release; Platform=x64; PlatformToolset=v141 /target:DebugEngine\M agoRemote MagoDbg_2010.sln
119+ cd ..\. .\m ago && msbuild " /p:Configuration=Release StaticDE;Platform=Win32;PlatformToolset=v141" /target:Expression\M agoNatCC MagoDbg_2010.sln
120+
121+ mago_vs16 :
122+ cd ..\. .\m ago && msbuild /p:Configuration=Release; Platform=Win32; PlatformToolset=v142 /target:DebugEngine\M agoNatDE MagoDbg_2010.sln
123+ cd ..\. .\m ago && msbuild /p:Configuration=Release; Platform=x64; PlatformToolset=v142 /target:DebugEngine\M agoRemote MagoDbg_2010.sln
124+ cd ..\. .\m ago && msbuild " /p:Configuration=Release StaticDE;Platform=Win32;PlatformToolset=v142" /target:Expression\M agoNatCC MagoDbg_2010.sln
110125
111126cv2pdb :
112127 cd ..\. .\c v2pdb\t runk && devenv /Project " cv2pdb" /Build " Release|Win32" src\c v2pdb_vs12.sln
@@ -118,6 +133,11 @@ cv2pdb_vs15:
118133 cd ..\. .\c v2pdb\t runk && msbuild /p:Configuration=Release; Platform=Win32; PlatformToolset=v141 src\d viewhelper\d viewhelper.vcxproj
119134 cd ..\. .\c v2pdb\t runk && msbuild /p:Configuration=Release; Platform=Win32; PlatformToolset=v141 src\d umplines.vcxproj
120135
136+ cv2pdb_vs16 :
137+ cd ..\. .\c v2pdb\t runk && msbuild /p:Configuration=Release; Platform=Win32; PlatformToolset=v142 src\c v2pdb.vcxproj
138+ cd ..\. .\c v2pdb\t runk && msbuild /p:Configuration=Release; Platform=Win32; PlatformToolset=v142 src\d viewhelper\d viewhelper.vcxproj
139+ cd ..\. .\c v2pdb\t runk && msbuild /p:Configuration=Release; Platform=Win32; PlatformToolset=v142 src\d umplines.vcxproj
140+
121141dcxxfilt : $(DCXXFILT_EXE )
122142$(DCXXFILT_EXE ) : tools\dcxxfilt.d
123143# no space after Release, it will be part of environment variable
@@ -126,7 +146,7 @@ $(DCXXFILT_EXE): tools\dcxxfilt.d
126146# #################################
127147# create installer
128148
129- install_release_modules : install_modules dparser dparser_test cv2pdb mago dbuild12 dbuild14 dbuild15
149+ install_release_modules : install_modules dparser dparser_test cv2pdb_vs16 mago_vs16 dbuild12 dbuild14 dbuild15
130150
131151install_vs : install_release_modules install_only
132152
@@ -138,4 +158,4 @@ install_modules: prerequisites visuald_vs vdserver vdextension visualdwizard dcx
138158
139159install_only :
140160 if not exist ..\d ownloads\n ul md ..\d ownloads
141- cd nsis && " $( NSIS) \makensis" /V1 " /DCONFIG=$( CONFIG) " visuald.nsi
161+ cd nsis && " $( NSIS) \makensis" /V1 " /DCONFIG=$( CONFIG) " $( NSIS_ARGS ) visuald.nsi
0 commit comments