From 048c281e79cacff734e1900cb77cd43b01ab1f63 Mon Sep 17 00:00:00 2001 From: marco Date: Sat, 31 Aug 2002 04:16:48 +0000 Subject: [PATCH] * BSD Libname fixes (eases Lazarus compilation). --- packages/extra/gtk/gdk/gdk.pp | 46 +++++++++++++---------------- packages/extra/gtk/glib/glib.pp | 50 +++++++++++++------------------ packages/extra/gtk/gtk/gtk.pp | 52 +++++++++++++++------------------ 3 files changed, 63 insertions(+), 85 deletions(-) diff --git a/packages/extra/gtk/gdk/gdk.pp b/packages/extra/gtk/gdk/gdk.pp index 2c1d6f6ff8..16d377ba07 100644 --- a/packages/extra/gtk/gdk/gdk.pp +++ b/packages/extra/gtk/gdk/gdk.pp @@ -41,24 +41,16 @@ uses {$packrecords C} {$else} - {$ifdef os2} - const - gdkdll='gdk12'; - {$define gtkos2} - - {$packrecords C} + const + {$ifdef BSD} + gdkdll='gdk12'; {$else} - const - {$ifdef FreeBSD} - gdkdll='gdk12'; - {$else} - gdkdll='gdk'; - {$endif} - {$linklib c} - {$linklib X11} - - {$packrecords C} + gdkdll='gdk'; {$endif} + {$linklib c} + {$linklib X11} + + {$packrecords C} {$endif} Type @@ -98,19 +90,21 @@ implementation end. { $Log$ - Revision 1.5 2002-08-18 19:36:58 marco - * small fixes for NetBSD that doesn't adhere to the gtk12/glib12 etc naming for older GTK versions. - - Revision 1.4 2003/03/02 02:08:50 hajny - + OS/2 support for GTK and X11 added by Yuri - - Revision 1.3 2002/09/07 15:42:58 peter - * old logs removed and tabs fixed - - Revision 1.2 2002/08/31 04:16:48 marco + Revision 1.2 2002-08-31 04:16:48 marco * BSD Libname fixes (eases Lazarus compilation). Revision 1.1 2002/01/29 17:55:07 peter * splitted to base and extra + Revision 1.5 2000/09/09 18:41:38 peter + * fixes for gtk win32 + + Revision 1.4 2000/09/06 21:14:28 peter + * packrecords 4 for win32, packrecords c for linux + + Revision 1.3 2000/08/06 10:46:23 peter + * force smartlink (merged) + + Revision 1.2 2000/07/13 11:33:19 michael + + removed logs } diff --git a/packages/extra/gtk/glib/glib.pp b/packages/extra/gtk/glib/glib.pp index bc7d6a4d64..8903fb3488 100644 --- a/packages/extra/gtk/glib/glib.pp +++ b/packages/extra/gtk/glib/glib.pp @@ -37,23 +37,15 @@ interface {$packrecords C} {$else} - {$ifdef os2} - const - glibdll='glib12'; - {$define gtkos2} + const + {$ifdef BSD} + glibdll='glib12'; + {$else} + glibdll='glib'; + {$endif} + {$linklib c} - {$packrecords C} - {$else} - const - {$ifdef FreeBSD} - glibdll='glib12'; - {$else} - glibdll='glib'; - {$endif} - {$linklib c} - - {$packrecords C} - {$endif} + {$packrecords C} {$endif} { Pointers to basic pascal types, inserted by h2pas conversion program.} @@ -129,14 +121,12 @@ type TGQuark = guint32; TGTime = gint32; -{$ifndef gtkos2} var glib_major_version : guint;external glibdll name 'glib_major_version'; glib_minor_version : guint;external glibdll name 'glib_minor_version'; glib_micro_version : guint;external glibdll name 'glib_micro_version'; glib_interface_age : guint;external glibdll name 'glib_interface_age'; glib_binary_age : guint;external glibdll name 'glib_binary_age'; -{$endif} type PGList = ^TGList; @@ -651,10 +641,8 @@ procedure g_on_error_query(prg_name:Pgchar);cdecl;external glibdll name 'g_on_er procedure g_on_error_stack_trace(prg_name:Pgchar);cdecl;external glibdll name 'g_on_error_stack_trace'; {$ifndef gtkwin} - {$ifndef gtkos2} var g_log_domain_glib : Pgchar;external glibdll name 'g_log_domain_glib'; - {$endif} {$endif} function g_log_set_handler(log_domain:Pgchar; log_levels:TGLogLevelFlags; log_func:TGLogFunc; user_data:gpointer):guint;cdecl;external glibdll name 'g_log_set_handler'; @@ -1666,19 +1654,21 @@ procedure set_year(var a : TGDate; __year : guint); end. { $Log$ - Revision 1.5 2002-08-18 19:36:58 marco - * small fixes for NetBSD that doesn't adhere to the gtk12/glib12 etc naming for older GTK versions. - - Revision 1.4 2003/03/02 02:10:19 hajny - + OS/2 support for GTK and X11 added by Yuri - - Revision 1.3 2002/09/07 15:42:58 peter - * old logs removed and tabs fixed - - Revision 1.2 2002/08/31 04:16:48 marco + Revision 1.2 2002-08-31 04:16:48 marco * BSD Libname fixes (eases Lazarus compilation). Revision 1.1 2002/01/29 17:55:08 peter * splitted to base and extra + Revision 1.5 2000/09/09 18:41:38 peter + * fixes for gtk win32 + + Revision 1.4 2000/09/06 21:14:28 peter + * packrecords 4 for win32, packrecords c for linux + + Revision 1.3 2000/08/06 10:46:23 peter + * force smartlink (merged) + + Revision 1.2 2000/07/13 11:33:19 michael + + removed logs } diff --git a/packages/extra/gtk/gtk/gtk.pp b/packages/extra/gtk/gtk/gtk.pp index 28585f9d9e..768dc03c46 100644 --- a/packages/extra/gtk/gtk/gtk.pp +++ b/packages/extra/gtk/gtk/gtk.pp @@ -41,27 +41,19 @@ uses {$packrecords c} {$else} - {$ifdef os2} - const - gtkdll='gtk12'; - {$define gtkos2} - - {$packrecords c} + const + {$ifdef BSD} + gtkdll='gtk12'; {$else} - const - {$ifdef FreeBSD} - gtkdll='gtk12'; - {$else} - gtkdll='gtk'; - {$endif} - {$linklib c} - {$linklib Xi} - {$linklib Xext} - {$linklib X11} - {$linklib m} - - {$packrecords C} + gtkdll='gtk'; {$endif} + {$linklib c} + {$linklib Xi} + {$linklib Xext} + {$linklib X11} + {$linklib m} + + {$packrecords C} {$endif} Type @@ -90,19 +82,21 @@ Type end. { $Log$ - Revision 1.5 2002-08-18 19:36:58 marco - * small fixes for NetBSD that doesn't adhere to the gtk12/glib12 etc naming for older GTK versions. - - Revision 1.4 2003/03/02 02:11:10 hajny - + OS/2 support for GTK and X11 added by Yuri - - Revision 1.3 2002/09/07 15:42:59 peter - * old logs removed and tabs fixed - - Revision 1.2 2002/08/31 04:16:48 marco + Revision 1.2 2002-08-31 04:16:48 marco * BSD Libname fixes (eases Lazarus compilation). Revision 1.1 2002/01/29 17:55:08 peter * splitted to base and extra + Revision 1.5 2000/09/09 18:41:39 peter + * fixes for gtk win32 + + Revision 1.4 2000/09/06 21:13:55 peter + * packrecords 4 for win32, packrecords c for linux + + Revision 1.3 2000/08/06 10:46:23 peter + * force smartlink (merged) + + Revision 1.2 2000/07/13 11:33:20 michael + + removed logs }