Skip to content

Commit f4f3016

Browse files
committed
Check also with Delphi for Win64
1 parent 9ec5a77 commit f4f3016

File tree

2 files changed

+19
-7
lines changed

2 files changed

+19
-7
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,7 @@ jobs:
3737
runs-on: ${{ matrix.host-label }}
3838
steps:
3939
- uses: actions/checkout@v4
40-
- name: Delphi Build
41-
run: make all-delphi
40+
- name: Delphi Build (Win32)
41+
run: make all-delphi-win32
42+
- name: Delphi Build (Win64)
43+
run: make all-delphi-win64

Makefile

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ FPC_COMMAND:=fpc -Mdelphi
66
# See https://github.com/castle-engine/castle-engine/blob/master/tools/build-tool/code/toolcompile.pas#L858
77
# for how Castle Game Engine build tool invokes dcc for some hints.
88
# -NS below follows the DPROJ settings generated by Delphi for new projects.
9-
DELPHI_COMMAND:=dcc32 '-NSSystem;Xml;Data;Datasnap;Web;Soap'
9+
DELPHI_OPTIONS_COMMON:='-NSSystem;Xml;Data;Datasnap;Web;Soap'
10+
DELPHI_WIN32_COMMAND:=dcc32 $(DELPHI_OPTIONS_COMMON)
11+
DELPHI_WIN64_COMMAND:=dcc64 $(DELPHI_OPTIONS_COMMON)
1012

1113
# Compile all examples with FPC.
1214
# Use `find` to find all *.dpr files (including subdirectories)
@@ -34,10 +36,18 @@ all-fpc331:
3436
'(' -execdir $(FPC_COMMAND) {} ';' -o -quit ')' \
3537
')'
3638

37-
# Build with Delphi.
38-
.PHONY: all-delphi
39-
all-delphi:
39+
# Build with Delphi for Win32.
40+
.PHONY: all-delphi-win32
41+
all-delphi-win32:
4042
find . \
4143
'(' -type f -iname *.dpr \
42-
'(' -execdir $(DELPHI_COMMAND) {} ';' -o -quit ')' \
44+
'(' -execdir $(DELPHI_WIN32_COMMAND) {} ';' -o -quit ')' \
45+
')'
46+
47+
# Build with Delphi for Win64.
48+
.PHONY: all-delphi-win64
49+
all-delphi-win64:
50+
find . \
51+
'(' -type f -iname *.dpr \
52+
'(' -execdir $(DELPHI_WIN64_COMMAND) {} ';' -o -quit ')' \
4353
')'

0 commit comments

Comments
 (0)