Improved MacOS support thanks to martin_fr

Reorganized demos by OS
2025-07-02 22:26:53 +02:00 · 2021-01-31 16:53:07 +01:00
parent cd46aa097d
commit e0396ac3a5
177 changed files with 4824 additions and 993 deletions
--- a/demos/Delphi_VCL/JavaScript/JSExecutingFunctions/cef.inc
+++ b/demos/Delphi_VCL/JavaScript/JSExecutingFunctions/cef.inc
@ -454,3 +454,15 @@
  {$DEFINE TARGET_32BITS}
 {$IFEND}

+// Delphi uses MACOS for the new MacOSX and DARWIN is not defined
+// FPC uses DARWIN for the new MacOSX and MACOS is defined for the classic Macintosh OS (System 7)
+// We define MACOSX to avoid conflicts in both situations
+{$IFDEF FPC}
+  {$IFDEF DARWIN}
+    {$DEFINE MACOSX}
+  {$IFEND}
+{$ELSE}
+  {$IFDEF MACOS}
+    {$DEFINE MACOSX}
+  {$IFEND}
+{$IFEND}