Przeglądaj źródła

* SharedSuffix moved to include files to reduce number of ifdefs

git-svn-id: trunk@14902 -
Tomas Hajny 15 lat temu
rodzic
commit
5c31042f6a

+ 0 - 15
rtl/inc/dynlibs.pas

@@ -113,21 +113,6 @@ function LoadLibrarySymbols(const Lib: TLibHandle; const Symbols: PLibSymbol; co
 procedure ClearLibrarySymbols(const Symbols: PLibSymbol; const Count: Integer);
 
 
-// these are for easier crossplatform construction of dll names in dynloading libs.
-Const
- {$ifdef Windows}
-  SharedSuffix  = 'dll';
- {$else}
-   {$ifdef Darwin}
-     SharedSuffix = 'dylib';
-   {$else}
-     {$ifdef OS2}
-       SharedSuffix = 'dll';
-     {$else}
-       SharedSuffix = 'so';
-     {$endif}
-   {$endif}
- {$endif}
 
 Implementation
 

+ 2 - 0
rtl/netwlibc/dynlibs.inc

@@ -24,6 +24,8 @@ Type
 
 Const
   NilHandle = Nil;
+// these are for easier crossplatform construction of dll names in dynloading libs.
+  SharedSuffix = 'so';
 
 {$else}
 

+ 2 - 0
rtl/os2/dynlibs.inc

@@ -25,6 +25,8 @@ type
 
 const
  NilHandle = 0;
+// these are for easier crossplatform construction of dll names in dynloading libs.
+ SharedSuffix  = 'dll';
 
 {$else}
 

+ 6 - 0
rtl/unix/dynlibs.inc

@@ -25,6 +25,12 @@ Type
 
 Const
   NilHandle = TLibHandle(0);
+// these are for easier crossplatform construction of dll names in dynloading libs.
+{$ifdef Darwin}
+  SharedSuffix = 'dylib';
+{$else Darwin}
+  SharedSuffix = 'so';
+{$endif Darwin}
 
 {$else}
 

+ 2 - 0
rtl/win/dynlibs.inc

@@ -25,6 +25,8 @@ Type
 
 Const
   NilHandle = 0;
+// these are for easier crossplatform construction of dll names in dynloading libs.
+  SharedSuffix = 'dll';
 
 {$else}
 

+ 2 - 0
rtl/wince/dynlibs.inc

@@ -25,6 +25,8 @@ Type
 
 Const
   NilHandle = 0;
+// these are for easier crossplatform construction of dll names in dynloading libs.
+  SharedSuffix = 'dll';
 
 {$else}