Skip to content

Commit fb5c95b

Browse files
update Definition to support Delphi 10, 10.1 & Python 3.5, 3.6
1 parent 23a3b28 commit fb5c95b

File tree

1 file changed

+89
-14
lines changed

1 file changed

+89
-14
lines changed

PythonForDelphi/Components/Sources/Core/Definition.Inc

Lines changed: 89 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
//{$DEFINE PYTHON32}
3737
//{$DEFINE PYTHON33}
3838
//{$DEFINE PYTHON34}
39+
//{$DEFINE PYTHON35}
40+
//{$DEFINE PYTHON36}
3941

4042
/////////////////////////////////////////////////////////////////////////////
4143
// Python for Delphi settings. Comment out the setting you want to enable.
@@ -314,6 +316,51 @@
314316
{$DEFINE DELPHIXE7_OR_HIGHER}
315317
{$DEFINE DELPHIXE8_OR_HIGHER}
316318
{$ENDIF}
319+
{$IFDEF VER300} // Delphi 10
320+
{$DEFINE DELPHIXE8}
321+
{$DEFINE DELPHI4_OR_HIGHER}
322+
{$DEFINE DELPHI5_OR_HIGHER}
323+
{$DEFINE DELPHI6_OR_HIGHER}
324+
{$DEFINE DELPHI7_OR_HIGHER}
325+
{$DEFINE DELPHI8_OR_HIGHER}
326+
{$DEFINE DELPHI2005_OR_HIGHER}
327+
{$DEFINE DELPHI2006_OR_HIGHER}
328+
{$DEFINE DELPHI2007_OR_HIGHER}
329+
{$DEFINE DELPHI2009_OR_HIGHER}
330+
{$DEFINE DELPHI2010_OR_HIGHER}
331+
{$DEFINE DELPHIXE_OR_HIGHER}
332+
{$DEFINE DELPHIXE2_OR_HIGHER}
333+
{$DEFINE DELPHIXE3_OR_HIGHER}
334+
{$DEFINE DELPHIXE4_OR_HIGHER}
335+
{$DEFINE DELPHIXE5_OR_HIGHER}
336+
{$DEFINE DELPHIXE6_OR_HIGHER}
337+
{$DEFINE DELPHIXE7_OR_HIGHER}
338+
{$DEFINE DELPHIXE8_OR_HIGHER}
339+
{$DEFINE DELPHI10_OR_HIGHER}
340+
{$ENDIF}
341+
{$IFDEF VER310} // Delphi 10.1
342+
{$DEFINE DELPHIXE8}
343+
{$DEFINE DELPHI4_OR_HIGHER}
344+
{$DEFINE DELPHI5_OR_HIGHER}
345+
{$DEFINE DELPHI6_OR_HIGHER}
346+
{$DEFINE DELPHI7_OR_HIGHER}
347+
{$DEFINE DELPHI8_OR_HIGHER}
348+
{$DEFINE DELPHI2005_OR_HIGHER}
349+
{$DEFINE DELPHI2006_OR_HIGHER}
350+
{$DEFINE DELPHI2007_OR_HIGHER}
351+
{$DEFINE DELPHI2009_OR_HIGHER}
352+
{$DEFINE DELPHI2010_OR_HIGHER}
353+
{$DEFINE DELPHIXE_OR_HIGHER}
354+
{$DEFINE DELPHIXE2_OR_HIGHER}
355+
{$DEFINE DELPHIXE3_OR_HIGHER}
356+
{$DEFINE DELPHIXE4_OR_HIGHER}
357+
{$DEFINE DELPHIXE5_OR_HIGHER}
358+
{$DEFINE DELPHIXE6_OR_HIGHER}
359+
{$DEFINE DELPHIXE7_OR_HIGHER}
360+
{$DEFINE DELPHIXE8_OR_HIGHER}
361+
{$DEFINE DELPHI10_OR_HIGHER}
362+
{$DEFINE DELPHI10.1_OR_HIGHER}
363+
{$ENDIF}
317364
/////////////////////////////////////////////////////////////////////////////
318365
// Python versions
319366
/////////////////////////////////////////////////////////////////////////////
@@ -322,19 +369,23 @@
322369
// Note that the installer will let the user specify its default Python version, and
323370
// thus will edit this file.
324371

325-
{$IFNDEF PYTHON34}
326-
{$IFNDEF PYTHON33}
327-
{$IFNDEF PYTHON32}
328-
{$IFNDEF PYTHON31}
329-
{$IFNDEF PYTHON30}
330-
{$IFNDEF PYTHON27}
331-
{$IFNDEF PYTHON26}
332-
{$IFNDEF PYTHON25}
333-
{$IFNDEF PYTHON24}
334-
{$IFNDEF PYTHON23}
335-
{---<START OF DEFAULT PYTHON VERSION>---}
336-
{$DEFINE PYTHON27}
337-
{---<END OF DEFAULT PYTHON VERSION>---}
372+
{$IFNDEF PYTHON36}
373+
{$IFNDEF PYTHON35}
374+
{$IFNDEF PYTHON34}
375+
{$IFNDEF PYTHON33}
376+
{$IFNDEF PYTHON32}
377+
{$IFNDEF PYTHON31}
378+
{$IFNDEF PYTHON30}
379+
{$IFNDEF PYTHON27}
380+
{$IFNDEF PYTHON26}
381+
{$IFNDEF PYTHON25}
382+
{$IFNDEF PYTHON24}
383+
{$IFNDEF PYTHON23}
384+
{---<START OF DEFAULT PYTHON VERSION>---}
385+
{$DEFINE PYTHON27}
386+
{---<END OF DEFAULT PYTHON VERSION>---}
387+
{$ENDIF}
388+
{$ENDIF}
338389
{$ENDIF}
339390
{$ENDIF}
340391
{$ENDIF}
@@ -416,7 +467,31 @@
416467
{$DEFINE PYTHON33_OR_HIGHER}
417468
{$DEFINE PYTHON34_OR_HIGHER}
418469
{$ENDIF}
419-
470+
{$IFDEF PYTHON35}
471+
{$DEFINE PYTHON23_OR_HIGHER}
472+
{$DEFINE PYTHON24_OR_HIGHER}
473+
{$DEFINE PYTHON25_OR_HIGHER}
474+
{$DEFINE PYTHON26_OR_HIGHER}
475+
{$DEFINE PYTHON30_OR_HIGHER}
476+
{$DEFINE PYTHON31_OR_HIGHER}
477+
{$DEFINE PYTHON32_OR_HIGHER}
478+
{$DEFINE PYTHON33_OR_HIGHER}
479+
{$DEFINE PYTHON34_OR_HIGHER}
480+
{$DEFINE PYTHON35_OR_HIGHER}
481+
{$ENDIF}
482+
{$IFDEF PYTHON36}
483+
{$DEFINE PYTHON23_OR_HIGHER}
484+
{$DEFINE PYTHON24_OR_HIGHER}
485+
{$DEFINE PYTHON25_OR_HIGHER}
486+
{$DEFINE PYTHON26_OR_HIGHER}
487+
{$DEFINE PYTHON30_OR_HIGHER}
488+
{$DEFINE PYTHON31_OR_HIGHER}
489+
{$DEFINE PYTHON32_OR_HIGHER}
490+
{$DEFINE PYTHON33_OR_HIGHER}
491+
{$DEFINE PYTHON34_OR_HIGHER}
492+
{$DEFINE PYTHON35_OR_HIGHER}
493+
{$DEFINE PYTHON36_OR_HIGHER}
494+
{$ENDIF}
420495
/////////////////////////////////////////////////////////////////////////////
421496
// Misc
422497
/////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)