From 56dbdaf5d7855632eeea4cfe820531bc24b09ee0 Mon Sep 17 00:00:00 2001 From: Alexey Kulakov Date: Wed, 15 Jan 2014 21:18:15 +0000 Subject: sync git-svn-id: http://svn.miranda-ng.org/main/trunk@7671 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Utils.pas/compilers.inc | 168 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 168 insertions(+) (limited to 'plugins/Utils.pas/compilers.inc') diff --git a/plugins/Utils.pas/compilers.inc b/plugins/Utils.pas/compilers.inc index 95940246e1..b3280f17d7 100644 --- a/plugins/Utils.pas/compilers.inc +++ b/plugins/Utils.pas/compilers.inc @@ -133,12 +133,39 @@ {$ifdef Win64} + // BDS XE5 (BDS 9.0) DELPHI and BCB are no longer defined, only COMPILER + {$ifdef VER260} + {$define COMPILER_19} + {$endif VER260} + + // BDS XE4 (BDS 9.0) DELPHI and BCB are no longer defined, only COMPILER + {$ifdef VER250} + {$define COMPILER_18} + {$endif VER250} + + // BDS XE3 (BDS 9.0) DELPHI and BCB are no longer defined, only COMPILER + {$ifdef VER240} + {$define COMPILER_17} + {$endif VER240} + // BDS XE2 (BDS 9.0) DELPHI and BCB are no longer defined, only COMPILER {$ifdef VER230} {$define COMPILER_16} {$endif VER230} + {$ifdef COMPILER_19} + {$define COMPILER_19_UP} + {$endif} + + {$ifdef COMPILER_18} + {$define COMPILER_18_UP} + {$endif} + + {$ifdef COMPILER_17} + {$define COMPILER_17_UP} + {$endif} + {$ifdef COMPILER_16} {$define COMPILER_16_UP} {$endif} @@ -160,6 +187,21 @@ // Compiler defines not specific to a particlular platform. + // BDS XE5 (BDS 9.0) DELPHI and BCB are no longer defined, only COMPILER + {$ifdef VER260} + {$define COMPILER_19} + {$endif VER260} + + // BDS XE4 (BDS 9.0) DELPHI and BCB are no longer defined, only COMPILER + {$ifdef VER250} + {$define COMPILER_18} + {$endif VER250} + + // BDS XE3 (BDS 9.0) DELPHI and BCB are no longer defined, only COMPILER + {$ifdef VER240} + {$define COMPILER_17} + {$endif VER240} + // BDS XE2 (BDS 9.0) DELPHI and BCB are no longer defined, only COMPILER {$ifdef VER230} {$define COMPILER_16} @@ -766,6 +808,132 @@ {$endif} +{$endif} + +{$ifdef COMPILER_17} + {$define COMPILER_1_UP} + {$define COMPILER_2_UP} + {$define COMPILER_3_UP} + {$define COMPILER_4_UP} + {$define COMPILER_5_UP} + {$define COMPILER_6_UP} + {$define COMPILER_7_UP} + {$define COMPILER_8_UP} + {$define COMPILER_9_UP} + {$define COMPILER_10_UP} + {$define COMPILER_11_UP} + {$define COMPILER_12_UP} + {$define COMPILER_14_UP} + {$define COMPILER_15_UP} + {$define COMPILER_16_UP} + {$define COMPILER_17_UP} + // Backwards compatibility + {$define DELPHI_2_UP} + {$define DELPHI_3_UP} + {$define DELPHI_4_UP} + {$define DELPHI_5_UP} + {$define DELPHI_6_UP} + {$define DELPHI_7_UP} + {$define DELPHI_8_UP} + {$define DELPHI_9_UP} + {$define CPPB_3_UP} + {$define CPPB_4_UP} + {$define CPPB_5_UP} + {$define CPPB_6_UP} + + + {$ifdef BCB} + {$define CPPB} + {$else} + {$define DELPHI} + {$endif} + + +{$endif} + +{$ifdef COMPILER_18} + {$define COMPILER_1_UP} + {$define COMPILER_2_UP} + {$define COMPILER_3_UP} + {$define COMPILER_4_UP} + {$define COMPILER_5_UP} + {$define COMPILER_6_UP} + {$define COMPILER_7_UP} + {$define COMPILER_8_UP} + {$define COMPILER_9_UP} + {$define COMPILER_10_UP} + {$define COMPILER_11_UP} + {$define COMPILER_12_UP} + {$define COMPILER_14_UP} + {$define COMPILER_15_UP} + {$define COMPILER_16_UP} + {$define COMPILER_17_UP} + {$define COMPILER_18_UP} + // Backwards compatibility + {$define DELPHI_2_UP} + {$define DELPHI_3_UP} + {$define DELPHI_4_UP} + {$define DELPHI_5_UP} + {$define DELPHI_6_UP} + {$define DELPHI_7_UP} + {$define DELPHI_8_UP} + {$define DELPHI_9_UP} + {$define CPPB_3_UP} + {$define CPPB_4_UP} + {$define CPPB_5_UP} + {$define CPPB_6_UP} + + + {$ifdef BCB} + {$define CPPB} + {$else} + {$define DELPHI} + {$endif} + + +{$endif} + +{$ifdef COMPILER_19} + {$define COMPILER_1_UP} + {$define COMPILER_2_UP} + {$define COMPILER_3_UP} + {$define COMPILER_4_UP} + {$define COMPILER_5_UP} + {$define COMPILER_6_UP} + {$define COMPILER_7_UP} + {$define COMPILER_8_UP} + {$define COMPILER_9_UP} + {$define COMPILER_10_UP} + {$define COMPILER_11_UP} + {$define COMPILER_12_UP} + {$define COMPILER_14_UP} + {$define COMPILER_15_UP} + {$define COMPILER_16_UP} + {$define COMPILER_17_UP} + {$define COMPILER_18_UP} + {$define COMPILER_19_UP} + // Backwards compatibility + {$define DELPHI_2_UP} + {$define DELPHI_3_UP} + {$define DELPHI_4_UP} + {$define DELPHI_5_UP} + {$define DELPHI_6_UP} + {$define DELPHI_7_UP} + {$define DELPHI_8_UP} + {$define DELPHI_9_UP} + {$define CPPB_3_UP} + {$define CPPB_4_UP} + {$define CPPB_5_UP} + {$define CPPB_6_UP} + + + {$ifdef BCB} + {$define CPPB} + {$else} + {$define DELPHI} + {$endif} + + {$endif} {$UNDEF AllowInline} -- cgit v1.2.3