Skip to content

Commit b9249b8

Browse files
committed
RibbonDesigner is now built with 10.4. Supporting more MsBuild versions.
1 parent ae34baf commit b9249b8

File tree

1 file changed

+11
-2
lines changed

1 file changed

+11
-2
lines changed

MAKEFILE

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,13 @@
1-
BUILDEXE = "$(PROGRAMFILES)\Microsoft Visual Studio\2017\Enterprise\MSBuild\15.0\Bin\msbuild.exe"
1+
# Default MS Build version
2+
!IF EXIST("$(PROGRAMFILES)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\msbuild.exe")
3+
BUILDEXE = "$(PROGRAMFILES)\Microsoft Visual Studio\2019\Enterprise\MSBuild\Current\Bin\msbuild.exe"
4+
!ELSE
5+
!IF EXIST("$(PROGRAMFILES)\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\msbuild.exe")
6+
BUILDEXE = "$(PROGRAMFILES)\Microsoft Visual Studio\2019\Professional\MSBuild\Current\Bin\msbuild.exe"
7+
!ELSE
8+
BUILDEXE = "$(PROGRAMFILES)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\msbuild.exe"
9+
!ENDIF
10+
!ENDIF
211
BUILD = $(BUILDEXE) /t:Rebuild
312
EMBARCADERO = $(PROGRAMFILES)\Embarcadero\RAD Studio
413
STUDIO = $(PROGRAMFILES)\Embarcadero\Studio
@@ -31,7 +40,7 @@ _XE5:
3140
$(MAKE) _samples
3241

3342
"Designer\Bin\RibbonDesigner.exe": Designer\*.pas Designer\*.dfm Designer\*.dpr Designer\*.dproj
34-
SET BDS=$(STUDIO)\19.0
43+
SET BDS=$(STUDIO)\21.0
3544
$(BUILD) /p:Config=Release "Designer\RibbonDesigner.dproj"
3645

3746
"Samples\High Level\01 Simple Ribbon\SimpleRibbon.exe": "Samples\High Level\01 Simple Ribbon\*.dproj" "Samples\High Level\01 Simple Ribbon\*.pas" "Samples\High Level\01 Simple Ribbon\*.dpr"

0 commit comments

Comments
 (0)