Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

changing some defines and adding Delphi 10.4 Sydney #2

Merged
merged 1 commit into from
Nov 9, 2020
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions compiler.inc
Original file line number Diff line number Diff line change
Expand Up @@ -157,39 +157,48 @@
// Delphi Seattle (Win32/Win64/OSX/iOS32/iOS64/Android)
{$IFDEF VER300}
{$DEFINE DELPHI23}
{$DEFINE DELPHI_XE10}
{$DEFINE DELPHI_10_0}
{$DEFINE DELPHI_SEATTLE}
{$UNDEF DELPHI_XX}
{$ENDIF}

// Delphi Berlin (Win32/Win64/OSX/iOS32/iOS64/Android)
{$IFDEF VER310}
{$DEFINE DELPHI24}
{$DEFINE DELPHI_XE11}
{$DEFINE DELPHI_10_1}
{$DEFINE DELPHI_BERLIN}
{$UNDEF DELPHI_XX}
{$ENDIF}

// Delphi Tokyo (Win32/Win64/OSX/iOS32/iOS64/Android/Linux64)
{$IFDEF VER320}
{$DEFINE DELPHI25}
{$DEFINE DELPHI_XE12}
{$DEFINE DELPHI_10_2}
{$DEFINE DELPHI_TOKYO}
{$UNDEF DELPHI_XX}
{$ENDIF}

// Delphi Rio (Win32/Win64/OSX/iOS32/iOS64/Android/Linux64)
// Delphi Rio (Win32/Win64/OSX/iOS32/iOS64/Android/Android64/Linux64)
{$IFDEF VER330}
{$DEFINE DELPHI26}
{$DEFINE DELPHI_XE13}
{$DEFINE DELPHI_10_3}
{$DEFINE DELPHI_RIO}
{$UNDEF DELPHI_XX}
{$ENDIF}

// Delphi Sydney (Win32/Win64/OSX64/iOS32/iOS64/Android/Android64/Linux64)
{$IFDEF VER340}
{$DEFINE DELPHI27}
{$DEFINE DELPHI_10_4}
{$DEFINE DELPHI_SYDNEY}
{$UNDEF DELPHI_XX}
{$ENDIF}

{$IFDEF DELPHI_XX}
ERROR: Unknown compiler please update compiler.inc file
{$ENDIF}

{$IFDEF DELPHI27} {$DEFINE DELPHI27_UP} {$ENDIF}
{$IFDEF DELPHI26} {$DEFINE DELPHI26_UP} {$ENDIF}
{$IFDEF DELPHI25} {$DEFINE DELPHI25_UP} {$ENDIF}
{$IFDEF DELPHI24} {$DEFINE DELPHI24_UP} {$ENDIF}
Expand All @@ -216,6 +225,7 @@
{$IFDEF DELPHI2} {$DEFINE DELPHI2_UP} {$ENDIF}
{$IFDEF DELPHI1} {$DEFINE DELPHI1_UP} {$ENDIF}

{$IFDEF DELPHI27_UP} {$DEFINE DELPHI26_UP} {$ENDIF}
{$IFDEF DELPHI26_UP} {$DEFINE DELPHI25_UP} {$ENDIF}
{$IFDEF DELPHI25_UP} {$DEFINE DELPHI24_UP} {$ENDIF}
{$IFDEF DELPHI24_UP} {$DEFINE DELPHI23_UP} {$ENDIF}
Expand All @@ -242,10 +252,11 @@
{$IFDEF DELPHI3_UP} {$DEFINE DELPHI2_UP} {$ENDIF}
{$IFDEF DELPHI2_UP} {$DEFINE DELPHI1_UP} {$ENDIF}

{$IFDEF DELPHI26_UP} {$DEFINE DELPHI_XE13_UP} {$DEFINE DELPHI_RIO_UP} {$ENDIF}
{$IFDEF DELPHI25_UP} {$DEFINE DELPHI_XE12_UP} {$DEFINE DELPHI_TOKYO_UP} {$ENDIF}
{$IFDEF DELPHI24_UP} {$DEFINE DELPHI_XE11_UP} {$DEFINE DELPHI_BERLIN_UP} {$ENDIF}
{$IFDEF DELPHI23_UP} {$DEFINE DELPHI_XE10_UP} {$DEFINE DELPHI_SEATTLE_UP} {$ENDIF}
{$IFDEF DELPHI27_UP} {$DEFINE DELPHI_10_4_UP} {$DEFINE DELPHI_SYDNEY_UP} {$ENDIF}
{$IFDEF DELPHI26_UP} {$DEFINE DELPHI_10_3_UP} {$DEFINE DELPHI_RIO_UP} {$ENDIF}
{$IFDEF DELPHI25_UP} {$DEFINE DELPHI_10_2_UP} {$DEFINE DELPHI_TOKYO_UP} {$ENDIF}
{$IFDEF DELPHI24_UP} {$DEFINE DELPHI_10_1_UP} {$DEFINE DELPHI_BERLIN_UP} {$ENDIF}
{$IFDEF DELPHI23_UP} {$DEFINE DELPHI_10_0_UP} {$DEFINE DELPHI_SEATTLE_UP} {$ENDIF}
{$IFDEF DELPHI22_UP} {$DEFINE DELPHI_XE8_UP} {$ENDIF}
{$IFDEF DELPHI21_UP} {$DEFINE DELPHI_XE7_UP} {$ENDIF}
{$IFDEF DELPHI20_UP} {$DEFINE DELPHI_XE6_UP} {$ENDIF}
Expand Down