From 6913f674b0d5e5c160c370380a0d346317a10b7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= Date: Mon, 6 Mar 2023 14:58:00 +0100 Subject: [PATCH] * Dotted filenames for package imagemagick --- packages/imagemagick/namespaced/Api.Buildim.pp | 3 +++ packages/imagemagick/namespaced/Api.Imagemagick.pas | 3 +++ packages/imagemagick/namespaced/Api.Magick_wand.pas | 3 +++ packages/imagemagick/namespaces.lst | 5 +++++ packages/imagemagick/src/buildim.pp | 6 ++++++ packages/imagemagick/src/imagemagick.pas | 6 ++++++ packages/imagemagick/src/magick_wand.pas | 6 ++++++ 7 files changed, 32 insertions(+) create mode 100644 packages/imagemagick/namespaced/Api.Buildim.pp create mode 100644 packages/imagemagick/namespaced/Api.Imagemagick.pas create mode 100644 packages/imagemagick/namespaced/Api.Magick_wand.pas create mode 100644 packages/imagemagick/namespaces.lst diff --git a/packages/imagemagick/namespaced/Api.Buildim.pp b/packages/imagemagick/namespaced/Api.Buildim.pp new file mode 100644 index 0000000000..eb1c715b43 --- /dev/null +++ b/packages/imagemagick/namespaced/Api.Buildim.pp @@ -0,0 +1,3 @@ +unit Api.Buildim; +{$DEFINE FPC_DOTTEDUNITS} +{$i buildim.pp} diff --git a/packages/imagemagick/namespaced/Api.Imagemagick.pas b/packages/imagemagick/namespaced/Api.Imagemagick.pas new file mode 100644 index 0000000000..90a8a0713c --- /dev/null +++ b/packages/imagemagick/namespaced/Api.Imagemagick.pas @@ -0,0 +1,3 @@ +unit Api.Imagemagick; +{$DEFINE FPC_DOTTEDUNITS} +{$i imagemagick.pas} diff --git a/packages/imagemagick/namespaced/Api.Magick_wand.pas b/packages/imagemagick/namespaced/Api.Magick_wand.pas new file mode 100644 index 0000000000..e2a4976fb1 --- /dev/null +++ b/packages/imagemagick/namespaced/Api.Magick_wand.pas @@ -0,0 +1,3 @@ +unit Api.Magick_wand; +{$DEFINE FPC_DOTTEDUNITS} +{$i magick_wand.pas} diff --git a/packages/imagemagick/namespaces.lst b/packages/imagemagick/namespaces.lst new file mode 100644 index 0000000000..03317a4d02 --- /dev/null +++ b/packages/imagemagick/namespaces.lst @@ -0,0 +1,5 @@ +src/imagemagick.pas=namespaced/Api.Imagemagick.pas +{s*:src/}=namespaced/ +{i+:src/} +src/buildim.pp=namespaced/Api.Buildim.pp +src/magick_wand.pas=namespaced/Api.Magick_wand.pas diff --git a/packages/imagemagick/src/buildim.pp b/packages/imagemagick/src/buildim.pp index 33898da68a..b531b5587c 100644 --- a/packages/imagemagick/src/buildim.pp +++ b/packages/imagemagick/src/buildim.pp @@ -18,11 +18,17 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02111-1301, USA. } +{$IFNDEF FPC_DOTTEDUNITS} unit buildim; +{$ENDIF FPC_DOTTEDUNITS} Interface +{$IFDEF FPC_DOTTEDUNITS} +uses Api.Imagemagick, Api.Magick_wand; +{$ELSE FPC_DOTTEDUNITS} uses imagemagick, magick_wand; +{$ENDIF FPC_DOTTEDUNITS} Implementation diff --git a/packages/imagemagick/src/imagemagick.pas b/packages/imagemagick/src/imagemagick.pas index 23be4e75b5..33043dd32b 100644 --- a/packages/imagemagick/src/imagemagick.pas +++ b/packages/imagemagick/src/imagemagick.pas @@ -22,7 +22,9 @@ Thanks to Marc Geldon and RuBBeR } {Version 0.4} +{$IFNDEF FPC_DOTTEDUNITS} unit ImageMagick; +{$ENDIF FPC_DOTTEDUNITS} {$ifdef FPC} {$mode objfpc} @@ -31,7 +33,11 @@ unit ImageMagick; interface +{$IFDEF FPC_DOTTEDUNITS} +uses System.SysUtils, System.CTypes; +{$ELSE FPC_DOTTEDUNITS} uses SysUtils, ctypes; +{$ENDIF FPC_DOTTEDUNITS} {$z4} diff --git a/packages/imagemagick/src/magick_wand.pas b/packages/imagemagick/src/magick_wand.pas index aa37eb738a..a516e0085b 100644 --- a/packages/imagemagick/src/magick_wand.pas +++ b/packages/imagemagick/src/magick_wand.pas @@ -24,7 +24,9 @@ Thanks to Marc Geldon and RuBBeR } {Version 0.4} +{$IFNDEF FPC_DOTTEDUNITS} unit magick_wand; +{$ENDIF FPC_DOTTEDUNITS} {$IFDEF FPC} {$mode objfpc} @@ -35,7 +37,11 @@ unit magick_wand; interface +{$IFDEF FPC_DOTTEDUNITS} +uses Api.Imagemagick, System.CTypes; +{$ELSE FPC_DOTTEDUNITS} uses ImageMagick, ctypes; +{$ENDIF FPC_DOTTEDUNITS} { Various types } type