Skip to content

Commit ed83450

Browse files
committed
* Updated Makefile to allow building with Delphi 12:
- updated MSBuild version, now supporting visual studio 2022 - corrected program files path to use (RAD Studio installs to Program Files x86, except for when it runs on 32bit machines -> no longer supported in this makefile) - the 'Package' target now has dependencies, as "Package" is a folder, which already exists and would thus never be built - updated continuousBuilds target to work with Delphi 12 now
1 parent 67b1f89 commit ed83450

File tree

1 file changed

+20
-13
lines changed

1 file changed

+20
-13
lines changed

MAKEFILE

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,34 @@
11
# 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
2+
!IF EXIST("$(PROGRAMFILES)\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\msbuild.exe")
3+
BUILDEXE = "$(PROGRAMFILES)\Microsoft Visual Studio\2022\Enterprise\MSBuild\Current\Bin\msbuild.exe"
4+
!ELSE IF EXIST("$(PROGRAMFILES)\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin\msbuild.exe")
5+
BUILDEXE = "$(PROGRAMFILES)\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin\msbuild.exe"
6+
!ELSE IF EXIST("$(PROGRAMFILES)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\msbuild.exe")
87
BUILDEXE = "$(PROGRAMFILES)\Microsoft Visual Studio\2017\BuildTools\MSBuild\15.0\Bin\msbuild.exe"
8+
!ELSE
9+
BUILDEXE = "msbuild.exe"
910
!ENDIF
10-
!ENDIF
11+
12+
PROGRAMFILESX86 = C:\Program Files (x86)
13+
1114
BUILD = $(BUILDEXE) /t:Rebuild
12-
EMBARCADERO = $(PROGRAMFILES)\Embarcadero\RAD Studio
13-
STUDIO = $(PROGRAMFILES)\Embarcadero\Studio
15+
EMBARCADERO = $(PROGRAMFILESX86)\Embarcadero\RAD Studio
16+
STUDIO = $(PROGRAMFILESX86)\Embarcadero\Studio
1417
BDSCOMMONDIRMAIN = %PUBLIC%\Documents\Embarcadero\Studio\
1518

1619
clean:
1720
DEL /S *.EXE
1821
DEL /S *.DCU
1922
DEL /S *.BPL
2023

21-
Package:
22-
SET BDS=$(STUDIO)\$(BDSVersion)
24+
Package: lib\* Package\Delphi\*
25+
@SET BDS=$(STUDIO)\$(BDSVersion)
26+
@SET BDSINCLUDE=$(STUDIO)\$(BDSVersion)\include
2327
$(BUILD) "Package\UIRibbonPackage.dproj"
2428

29+
12.0:
30+
$(MAKE) Package "BDSVersion=23.0"
31+
2532
10.4:
2633
$(MAKE) Package "BDSVersion=21.0"
2734

@@ -40,7 +47,7 @@ _XE5:
4047
$(MAKE) _samples
4148

4249
"Designer\Bin\RibbonDesigner.exe": Designer\*.pas Designer\*.dfm Designer\*.dpr Designer\*.dproj
43-
SET BDS=$(STUDIO)\21.0
50+
SET BDS=$(STUDIO)\23.0
4451
$(BUILD) /p:Config=Release "Designer\RibbonDesigner.dproj"
4552

4653
"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"
@@ -66,4 +73,4 @@ _XE5:
6673

6774
_samples: "Samples\High Level\01 Simple Ribbon\SimpleRibbon.exe" "Samples\High Level\02 Context Popup\ContextPopup.exe" "Samples\High Level\03 DropDown Color Picker\DropDownColorPicker.exe" "Samples\High Level\04 Gallery\Gallery.exe" "Samples\High Level\05 Font Control\FontControl.exe" "Samples\High Level\06 Text Pad\TextPad.exe" "Samples\High Level\07 Text Pad with Action List\TextPad.exe"
6875

69-
_continuousbuilds: clean 10.4 "Designer\Bin\RibbonDesigner.exe" _samples
76+
_continuousbuilds: clean 12.0 "Designer\Bin\RibbonDesigner.exe" _samples

0 commit comments

Comments
 (0)