From 22d290491e837d0dfc7a2003aaa0791890014351 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Van=20Canneyt?= Date: Mon, 6 Mar 2023 14:58:04 +0100 Subject: [PATCH] * Dotted filenames for package gtk1 --- packages/gtk1/namespaced/Api.Gtk1.Gdk.pp | 3 +++ packages/gtk1/namespaced/Api.Gtk1.Gdkpixbuf.pp | 3 +++ packages/gtk1/namespaced/Api.Gtk1.Glib.pp | 3 +++ packages/gtk1/namespaced/Api.Gtk1.Gmodule.pp | 3 +++ packages/gtk1/namespaced/Api.Gtk1.Gtk.pp | 3 +++ packages/gtk1/namespaced/Api.Gtk1.Gtkglarea.pp | 3 +++ packages/gtk1/namespaces.lst | 14 ++++++++++++++ packages/gtk1/src/gdk/gdk.pp | 7 +++++++ packages/gtk1/src/gdk/gdkpixbuf.pp | 18 ++++++++++++++++++ packages/gtk1/src/glib/glib.pp | 2 ++ packages/gtk1/src/glib/gmodule.pp | 7 +++++++ packages/gtk1/src/gtk/gtk.pp | 7 +++++++ packages/gtk1/src/gtkgl/gtkglarea.pp | 7 +++++++ 13 files changed, 80 insertions(+) create mode 100644 packages/gtk1/namespaced/Api.Gtk1.Gdk.pp create mode 100644 packages/gtk1/namespaced/Api.Gtk1.Gdkpixbuf.pp create mode 100644 packages/gtk1/namespaced/Api.Gtk1.Glib.pp create mode 100644 packages/gtk1/namespaced/Api.Gtk1.Gmodule.pp create mode 100644 packages/gtk1/namespaced/Api.Gtk1.Gtk.pp create mode 100644 packages/gtk1/namespaced/Api.Gtk1.Gtkglarea.pp create mode 100644 packages/gtk1/namespaces.lst diff --git a/packages/gtk1/namespaced/Api.Gtk1.Gdk.pp b/packages/gtk1/namespaced/Api.Gtk1.Gdk.pp new file mode 100644 index 0000000000..8fe088bd3b --- /dev/null +++ b/packages/gtk1/namespaced/Api.Gtk1.Gdk.pp @@ -0,0 +1,3 @@ +unit Api.Gtk1.Gdk; +{$DEFINE FPC_DOTTEDUNITS} +{$i gdk.pp} diff --git a/packages/gtk1/namespaced/Api.Gtk1.Gdkpixbuf.pp b/packages/gtk1/namespaced/Api.Gtk1.Gdkpixbuf.pp new file mode 100644 index 0000000000..05dec256f8 --- /dev/null +++ b/packages/gtk1/namespaced/Api.Gtk1.Gdkpixbuf.pp @@ -0,0 +1,3 @@ +unit Api.Gtk1.Gdkpixbuf; +{$DEFINE FPC_DOTTEDUNITS} +{$i gdkpixbuf.pp} diff --git a/packages/gtk1/namespaced/Api.Gtk1.Glib.pp b/packages/gtk1/namespaced/Api.Gtk1.Glib.pp new file mode 100644 index 0000000000..43ba1a08fb --- /dev/null +++ b/packages/gtk1/namespaced/Api.Gtk1.Glib.pp @@ -0,0 +1,3 @@ +unit Api.Gtk1.Glib; +{$DEFINE FPC_DOTTEDUNITS} +{$i glib.pp} diff --git a/packages/gtk1/namespaced/Api.Gtk1.Gmodule.pp b/packages/gtk1/namespaced/Api.Gtk1.Gmodule.pp new file mode 100644 index 0000000000..1c483cd4fc --- /dev/null +++ b/packages/gtk1/namespaced/Api.Gtk1.Gmodule.pp @@ -0,0 +1,3 @@ +unit Api.Gtk1.Gmodule; +{$DEFINE FPC_DOTTEDUNITS} +{$i gmodule.pp} diff --git a/packages/gtk1/namespaced/Api.Gtk1.Gtk.pp b/packages/gtk1/namespaced/Api.Gtk1.Gtk.pp new file mode 100644 index 0000000000..a353625177 --- /dev/null +++ b/packages/gtk1/namespaced/Api.Gtk1.Gtk.pp @@ -0,0 +1,3 @@ +unit Api.Gtk1.Gtk; +{$DEFINE FPC_DOTTEDUNITS} +{$i gtk.pp} diff --git a/packages/gtk1/namespaced/Api.Gtk1.Gtkglarea.pp b/packages/gtk1/namespaced/Api.Gtk1.Gtkglarea.pp new file mode 100644 index 0000000000..c79f62305d --- /dev/null +++ b/packages/gtk1/namespaced/Api.Gtk1.Gtkglarea.pp @@ -0,0 +1,3 @@ +unit Api.Gtk1.Gtkglarea; +{$DEFINE FPC_DOTTEDUNITS} +{$i gtkglarea.pp} diff --git a/packages/gtk1/namespaces.lst b/packages/gtk1/namespaces.lst new file mode 100644 index 0000000000..7ef504a35f --- /dev/null +++ b/packages/gtk1/namespaces.lst @@ -0,0 +1,14 @@ +src/gtkgl/gtkglarea.pp=namespaced/Api.Gtk1.Gtkglarea.pp +{s*:src/gtkgl/}=namespaced/ +{i+:src/gtkgl/} +src/gtk/gtk.pp=namespaced/Api.Gtk1.Gtk.pp +{s*:src/gtk/}=namespaced/ +{i+:src/gtk/} +src/glib/gmodule.pp=namespaced/Api.Gtk1.Gmodule.pp +{s*:src/glib/}=namespaced/ +{i+:src/glib/} +src/glib/glib.pp=namespaced/Api.Gtk1.Glib.pp +src/gdk/gdkpixbuf.pp=namespaced/Api.Gtk1.Gdkpixbuf.pp +{s*:src/gdk/}=namespaced/ +{i+:src/gdk/} +src/gdk/gdk.pp=namespaced/Api.Gtk1.Gdk.pp diff --git a/packages/gtk1/src/gdk/gdk.pp b/packages/gtk1/src/gdk/gdk.pp index 90b2ffc1fd..49f33f83e8 100644 --- a/packages/gtk1/src/gdk/gdk.pp +++ b/packages/gtk1/src/gdk/gdk.pp @@ -19,7 +19,9 @@ Boston, MA 02111-1301, USA. **********************************************************************} +{$IFNDEF FPC_DOTTEDUNITS} unit gdk; +{$ENDIF FPC_DOTTEDUNITS} interface {$mode objfpc} { needed for array of const } @@ -32,8 +34,13 @@ interface {$endif} {$endif} +{$IFDEF FPC_DOTTEDUNITS} +uses + Api.Gtk1.Glib; +{$ELSE FPC_DOTTEDUNITS} uses glib; +{$ENDIF FPC_DOTTEDUNITS} {$ifdef win32} const diff --git a/packages/gtk1/src/gdk/gdkpixbuf.pp b/packages/gtk1/src/gdk/gdkpixbuf.pp index 8cfeacb2b8..2cfc465242 100644 --- a/packages/gtk1/src/gdk/gdkpixbuf.pp +++ b/packages/gtk1/src/gdk/gdkpixbuf.pp @@ -25,7 +25,9 @@ Boston, MA 02111-1301, USA. **********************************************************************} +{$IFNDEF FPC_DOTTEDUNITS} unit gdkpixbuf; +{$ENDIF FPC_DOTTEDUNITS} interface {$ifndef os2} @@ -59,6 +61,21 @@ interface {$EndIf} +{$IFDEF FPC_DOTTEDUNITS} +Uses + Api.Gtk1.Glib, + {$IFDef XLIB_SUPPORT} + Api.X11.Xlib, + {$Else} + Api.Gtk1.Gdk + {$IFDef GTK_SUPPORT} + ,Api.Gtk1.Gtk + {$IfDef GNOME_SUPPORT} + ,GNOME + {$ENDIF} + {$ENDIF} + {$ENDIF}; +{$ELSE FPC_DOTTEDUNITS} Uses GLIB, {$IFDef XLIB_SUPPORT} @@ -72,6 +89,7 @@ Uses {$ENDIF} {$ENDIF} {$ENDIF}; +{$ENDIF FPC_DOTTEDUNITS} {$IFDef XLIB_SUPPORT} diff --git a/packages/gtk1/src/glib/glib.pp b/packages/gtk1/src/glib/glib.pp index c2df1ddf39..e0581d496e 100644 --- a/packages/gtk1/src/glib/glib.pp +++ b/packages/gtk1/src/glib/glib.pp @@ -18,7 +18,9 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. } +{$IFNDEF FPC_DOTTEDUNITS} unit glib; +{$ENDIF FPC_DOTTEDUNITS} interface {$mode objfpc} diff --git a/packages/gtk1/src/glib/gmodule.pp b/packages/gtk1/src/glib/gmodule.pp index ead50de612..fdaf0c5725 100644 --- a/packages/gtk1/src/glib/gmodule.pp +++ b/packages/gtk1/src/glib/gmodule.pp @@ -18,7 +18,9 @@ Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. } +{$IFNDEF FPC_DOTTEDUNITS} unit gmodule; +{$ENDIF FPC_DOTTEDUNITS} interface {$mode objfpc} @@ -31,8 +33,13 @@ interface {$endif} {$endif} +{$IFDEF FPC_DOTTEDUNITS} +uses + Api.Gtk1.Glib; +{$ELSE FPC_DOTTEDUNITS} uses glib; +{$ENDIF FPC_DOTTEDUNITS} {$ifdef win32} const diff --git a/packages/gtk1/src/gtk/gtk.pp b/packages/gtk1/src/gtk/gtk.pp index cfb1777914..0d242594ee 100644 --- a/packages/gtk1/src/gtk/gtk.pp +++ b/packages/gtk1/src/gtk/gtk.pp @@ -19,7 +19,9 @@ Boston, MA 02110-1301, USA. **********************************************************************} +{$IFNDEF FPC_DOTTEDUNITS} unit gtk; +{$ENDIF FPC_DOTTEDUNITS} interface { Always use smartlinking for win32, this solves some undefined functions @@ -32,8 +34,13 @@ interface {$mode objfpc} { needed for array of const } +{$IFDEF FPC_DOTTEDUNITS} +uses + Api.Gtk1.Glib,Api.Gtk1.Gdk; +{$ELSE FPC_DOTTEDUNITS} uses glib,gdk; +{$ENDIF FPC_DOTTEDUNITS} {$ifdef win32} const diff --git a/packages/gtk1/src/gtkgl/gtkglarea.pp b/packages/gtk1/src/gtkgl/gtkglarea.pp index 0e494e8d90..5116767725 100644 --- a/packages/gtk1/src/gtkgl/gtkglarea.pp +++ b/packages/gtk1/src/gtkgl/gtkglarea.pp @@ -22,7 +22,9 @@ * Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. } +{$IFNDEF FPC_DOTTEDUNITS} unit gtkglarea; +{$ENDIF FPC_DOTTEDUNITS} {$MODE objfpc} {$PACKRECORDS C} @@ -30,8 +32,13 @@ unit gtkglarea; interface {$ifndef os2} +{$IFDEF FPC_DOTTEDUNITS} +uses + Api.Gtk1.Gdk, Api.Gtk1.Gtk, Api.OpenGL.Gl; +{$ELSE FPC_DOTTEDUNITS} uses GDK, GTK, GL; +{$ENDIF FPC_DOTTEDUNITS} const libgtkgl = 'gtkgl';