paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-18 00:29:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Put every {$smarlink on} inside an {$ifndef NO_SMART_link} condition.

Browse Source 
This allows to do a 'make build' for win32 with nasm,
  using OPT="-Anasmwin32 -XS -dNO_SMART_LINK"

git-svn-id: trunk@7357 -
This commit is contained in:
pierre 2007-05-16 11:26:06 +00:00
parent df36385c89
commit 79f314cf96
17 changed files with 91 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/base/winunits/mmsystem.pp
View File

@ -7,7 +7,9 @@
(*********************************) (*********************************)
Unit mmsystem; Unit mmsystem;
{$smartlink on} {$ifndef NO_SMART_LINK}
{$smartlink on}
{$endif}
{$MODE DELPHI} {$MODE DELPHI}
interface interface
uses uses

4
packages/extra/gtk/gdk/gdk.pp
View File

@ -27,7 +27,9 @@ interface
{ Always use smartlinking for win32, this solves some undefined functions { Always use smartlinking for win32, this solves some undefined functions
in the development gtk versions which change often (PFV) } in the development gtk versions which change often (PFV) }
{$ifdef win32} {$ifdef win32}
{$smartlink on} {$ifndef NO_SMART_LINK}
{$smartlink on}
{$endif}
{$endif} {$endif}
uses uses

9
packages/extra/gtk/glib/glib.pp
View File

@ -26,7 +26,9 @@ interface
{ Always use smartlinking for win32, this solves some undefined functions { Always use smartlinking for win32, this solves some undefined functions
in the development gtk versions which change often (PFV) } in the development gtk versions which change often (PFV) }
{$ifdef win32} {$ifdef win32}
{$smartlink on} {$ifndef NO_SMART_LINK}
{$smartlink on}
{$endif}
{$endif} {$endif}
{$ifdef win32} {$ifdef win32}
@ -556,7 +558,10 @@ procedure g_hash_table_foreach(hash_table:PGHashTable; func:TGHFunc; user_data:g
function g_hash_table_foreach_remove(hash_table:PGHashTable; func:TGHRFunc; user_data:gpointer):guint;cdecl;external glibdll name 'g_hash_table_foreach_remove'; function g_hash_table_foreach_remove(hash_table:PGHashTable; func:TGHRFunc; user_data:gpointer):guint;cdecl;external glibdll name 'g_hash_table_foreach_remove';
function g_hash_table_size(hash_table:PGHashTable):guint;cdecl;external glibdll name 'g_hash_table_size'; function g_hash_table_size(hash_table:PGHashTable):guint;cdecl;external glibdll name 'g_hash_table_size';
function g_cache_new(value_new_func:TGCacheNewFunc; value_destroy_func:TGCacheDestroyFunc; key_dup_func:TGCacheDupFunc; key_destroy_func:TGCacheDestroyFunc; hash_key_func:TGHashFunc; hash_value_func:TGHashFunc; key_compare_func:TGCompareFunc):PGCache;cdecl;external glibdll name 'g_cache_new'; function g_cache_new(value_new_func:TGCacheNewFunc; value_destroy_func:TGCacheDestroyFunc;
key_dup_func:TGCacheDupFunc; key_destroy_func:TGCacheDestroyFunc;
hash_key_func:TGHashFunc; hash_value_func:TGHashFunc; key_compare_func:TGCompareFunc):PGCache;
cdecl;external glibdll name 'g_cache_new';
procedure g_cache_destroy(cache:PGCache);cdecl;external glibdll name 'g_cache_destroy'; procedure g_cache_destroy(cache:PGCache);cdecl;external glibdll name 'g_cache_destroy';
function g_cache_insert(cache:PGCache; key:gpointer):gpointer;cdecl;external glibdll name 'g_cache_insert'; function g_cache_insert(cache:PGCache; key:gpointer):gpointer;cdecl;external glibdll name 'g_cache_insert';
procedure g_cache_remove(cache:PGCache; value:gpointer);cdecl;external glibdll name 'g_cache_remove'; procedure g_cache_remove(cache:PGCache; value:gpointer);cdecl;external glibdll name 'g_cache_remove';

4
packages/extra/gtk/glib/gmodule.pp
View File

@ -26,7 +26,9 @@ interface
{ Always use smartlinking for win32, this solves some undefined functions { Always use smartlinking for win32, this solves some undefined functions
in the development gtk versions which change often (PFV) } in the development gtk versions which change often (PFV) }
{$ifdef win32} {$ifdef win32}
{$smartlink on} {$ifndef NO_SMART_LINK}
{$smartlink on}
{$endif}
{$endif} {$endif}
uses uses

4
packages/extra/gtk/gtk/gtk.pp
View File

@ -25,7 +25,9 @@ interface
{ Always use smartlinking for win32, this solves some undefined functions { Always use smartlinking for win32, this solves some undefined functions
in the development gtk versions which change often (PFV) } in the development gtk versions which change often (PFV) }
{$ifdef win32} {$ifdef win32}
{$smartlink on} {$ifndef NO_SMART_LINK}
{$smartlink on}
{$endif}
{$endif} {$endif}
{$mode objfpc} { needed for array of const } {$mode objfpc} { needed for array of const }

4
packages/extra/gtk2/atk/atk.pas
View File

@ -34,7 +34,9 @@ const
{$define atkwin} {$define atkwin}
atklib = 'libatk-1.0-0.dll'; atklib = 'libatk-1.0-0.dll';
{$IFDEF FPC} {$IFDEF FPC}
{$smartlink on} {$ifndef NO_SMART_LINK}
{$smartlink on}
{$endif}
{$ENDIF} {$ENDIF}
{$else} {$else}
{$ifdef UseCustomLibs} {$ifdef UseCustomLibs}

4
packages/extra/gtk2/glib/glib2.pas
View File

@ -45,7 +45,9 @@ const
gmodulelib = 'libgmodule-2.0-0.dll'; gmodulelib = 'libgmodule-2.0-0.dll';
gobjectlib = 'libgobject-2.0-0.dll'; gobjectlib = 'libgobject-2.0-0.dll';
{$IFDEF FPC} {$IFDEF FPC}
{$smartlink on} {$ifndef NO_SMART_LINK}
{$smartlink on}
{$endif}
{$ENDIF} {$ENDIF}
{$else} {$else}
{$ifdef UseCustomLibs} {$ifdef UseCustomLibs}

4
packages/extra/gtk2/gtk+/gdk-pixbuf/gdk2pixbuf.pas
View File

@ -40,7 +40,9 @@ const
{$define gdkpixbufwin} {$define gdkpixbufwin}
gdkpixbuflib = 'libgdk_pixbuf-2.0-0.dll'; gdkpixbuflib = 'libgdk_pixbuf-2.0-0.dll';
{$IFDEF FPC} {$IFDEF FPC}
{$smartlink on} {$ifndef NO_SMART_LINK}
{$smartlink on}
{$endif}
{$ENDIF} {$ENDIF}
{$else} {$else}
{$ifdef darwin} {$ifdef darwin}

4
packages/extra/gtk2/gtk+/gdk/gdk2.pas
View File

@ -37,7 +37,9 @@ const
{$DEFINE GDK_WINDOWING_WIN32} {$DEFINE GDK_WINDOWING_WIN32}
gdklib = 'libgdk-win32-2.0-0.dll'; gdklib = 'libgdk-win32-2.0-0.dll';
{$IFDEF FPC} {$IFDEF FPC}
{$smartlink on} {$ifndef NO_SMART_LINK}
{$smartlink on}
{$endif}
{$ENDIF} {$ENDIF}
GDK_HAVE_WCHAR_H=1; GDK_HAVE_WCHAR_H=1;
GDK_HAVE_WCTYPE_H=1; GDK_HAVE_WCTYPE_H=1;

4
packages/extra/gtk2/gtk+/gtk/gtk2.pas
View File

@ -74,7 +74,9 @@ const
{$DEFINE GTK_WINDOWING_WIN32} {$DEFINE GTK_WINDOWING_WIN32}
gtklib = 'libgtk-win32-2.0-0.dll'; gtklib = 'libgtk-win32-2.0-0.dll';
{$IFDEF FPC} {$IFDEF FPC}
{$smartlink on} {$ifndef NO_SMART_LINK}
{$smartlink on}
{$endif}
{$ENDIF} {$ENDIF}
{$else} {$else}
{$IFDEF KYLIX} {$IFDEF KYLIX}

4
packages/extra/gtk2/gtkhtml/gtkhtml.pas
View File

@ -43,7 +43,9 @@ const
{$DEFINE GTK_WINDOWING_WIN32} {$DEFINE GTK_WINDOWING_WIN32}
gtkhtmllib = 'libgtkhtml-win32-2.0-0.dll'; gtkhtmllib = 'libgtkhtml-win32-2.0-0.dll';
{$IFDEF FPC} {$IFDEF FPC}
{$smartlink on} {$ifndef NO_SMART_LINK}
{$smartlink on}
{$endif}
{$ENDIF} {$ENDIF}
{$else} {$else}
{$ifdef linux} {$ifdef linux}

4
packages/extra/gtk2/libglade/libglade2.pas
View File

@ -38,7 +38,9 @@ const
{$define gtkwin} {$define gtkwin}
LibGladeLib = 'libglade-2.0-0.dll'; LibGladeLib = 'libglade-2.0-0.dll';
{$IFDEF FPC} {$IFDEF FPC}
{$smartlink on} {$ifndef NO_SMART_LINK}
{$smartlink on}
{$endif}
{$ENDIF} {$ENDIF}
{$else} {$else}
LibGladeLib = 'libglade-2.0.so'; LibGladeLib = 'libglade-2.0.so';

4
packages/extra/gtk2/pango/pango.pas
View File

@ -40,7 +40,9 @@ const
{$define pangowin} {$define pangowin}
pangolib = 'libpango-1.0-0.dll'; pangolib = 'libpango-1.0-0.dll';
{$IFDEF FPC} {$IFDEF FPC}
{$smartlink on} {$ifndef NO_SMART_LINK}
{$smartlink on}
{$endif}
{$ENDIF} {$ENDIF}
{$else} {$else}
{$ifdef UseCustomLibs} {$ifdef UseCustomLibs}

2
packages/extra/libpng/png.pp
View File

@ -1,4 +1,6 @@
{$ifndef NO_SMART_LINK}
{$smartlink on} {$smartlink on}
{$endif}
unit png; unit png;
interface interface

2
packages/extra/zlib/zlib.pp
View File

@ -1,4 +1,6 @@
{$ifndef NO_SMART_LINK}
{$smartlink on} {$smartlink on}
{$endif}
unit zlib; unit zlib;
interface interface

2
rtl/objpas/fmtbcd.pp
View File

@ -84,7 +84,9 @@
{$note BCD Digits > 180} {$note BCD Digits > 180}
{$endif} {$endif}
{$ifndef NO_SMART_LINK}
{ $smartlink on} { $smartlink on}
{$endif}
{$define some_packed} { enable this to keep some local structures PACKED } {$define some_packed} { enable this to keep some local structures PACKED }

2
rtl/wince/winsock2.pp
View File

@ -12,7 +12,9 @@
unit WinSock2; unit WinSock2;
{$ifndef NO_SMART_LINK}
{$smartlink on} {$smartlink on}
{$endif}
{ convention is cdecl for WinCE API} { convention is cdecl for WinCE API}
{$calling cdecl} {$calling cdecl}