X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Flib%2Fmpg123%2Fmpg123.pas;h=9ba1f6b00d5e1895644717e99b218cf4aa51e956;hb=ca23794a6f2dc5eb454f65fc53efc265f16de612;hp=40ccc923b2e22d2f2611b5ac73649f5e6a7db97b;hpb=a4b97dbff3c995c7dda7fcfd5fc61e0aa19e7547;p=d2df-sdl.git

diff --git a/src/lib/mpg123/mpg123.pas b/src/lib/mpg123/mpg123.pas
index 40ccc92..9ba1f6b 100644
--- a/src/lib/mpg123/mpg123.pas
+++ b/src/lib/mpg123/mpg123.pas
@@ -17,7 +17,7 @@
 
 unit mpg123;
 
-{$mode objfpc}{$H+}
+{$MODE OBJFPC}{$H+}
 
 interface
 
@@ -26,26 +26,21 @@ uses
 
 {$IFDEF FPC}
 {$PACKRECORDS C}
-{$MODE OBJFPC}
 {$ENDIF}
 
-{$IFDEF WINDOWS}
-  {$IFNDEF LIBMPG123_WINDOZE_STATIC}
+{$IF DEFINED(WINDOWS)}
+  {$IFDEF MPG123_WINDOZE_STATIC}
+    {$LINKLIB libmpg123.a}
+  {$ELSE}
     {$DEFINE MPG123_DYNAMIC}
+    const LIB_MPG123 = 'libmpg123-0.dll';
   {$ENDIF}
-{$ENDIF}
-
-{$IF DEFINED(MPG123_DYNAMIC)}
-const
-{$IF DEFINED(WINDOWS)}
-  LIB_MPG123 = 'libmpg123-0.dll';
 {$ELSEIF DEFINED(UNIX)}
-  LIB_MPG123 = 'libmpg123.so';
-{$ELSE}
-  {$MESSAGE ERROR 'MPG123_DYNAMIC not supported'}
-{$IFEND}
+  {$DEFINE MPG123_DYNAMIC}
+  {$LINKLIB libmpg123}
+  const LIB_MPG123 = 'libmpg123';
 {$ELSE}
-  {$LINKLIB mpg123}
+  {$ERROR libmpg123 not supported on this platform. Fix it!}
 {$ENDIF}
 
 type
@@ -53,7 +48,8 @@ type
   ppclong = ^pclong;
   pcsize_t = ^csize_t;
   ppcint = ^pcint;
-  off_t = cint;
+(* off_t = cint; *)
+  off_t = coff_t;
   ppoff_t = ^poff_t;
   poff_t = ^coff_t;
   ppcuchar = ^pcuchar;
@@ -63,7 +59,7 @@ const
  * This should be incremented at least each time a new symbol is added
  * to the header.
  *)
-  MPG123_LIB_VERSION = '1.25.8';
+  MPG123_LIB_VERSION = '1.25.11';
   MPG123_API_VERSION = 44;
   MPG123_LIB_PATCHLEVEL = 7;