X-Git-Url: http://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Flib%2Fxmp%2Fxmp.pas;h=69d1e85da70fc9caf3e4cf188095cdaad9120b85;hb=38c57c930ec47a8cb5da5a2d0e7bdaa5c1e3a89a;hp=4b41b901de6c89c1f66a44b1ae90f5907c566e3c;hpb=01f7c9f6fb35b2b193cb967c2d881ab9fc5b6bcc;p=d2df-sdl.git

diff --git a/src/lib/xmp/xmp.pas b/src/lib/xmp/xmp.pas
index 4b41b90..69d1e85 100644
--- a/src/lib/xmp/xmp.pas
+++ b/src/lib/xmp/xmp.pas
@@ -7,35 +7,31 @@ interface
 {$MODE OBJFPC}
 {$ENDIF}
 
-{$IFDEF WINDOWS}
-  {$IFNDEF LIBXMP_WINDOZE_STATIC}
-    {$DEFINE XMP_DYNAMIC}
-  {$ENDIF}
-{$ENDIF}
-
-{$IF DEFINED(XMP_DYNAMIC)}
-const
 {$IF DEFINED(WINDOWS)}
-  {$IF DEFINED(USE_XMP_FULL)}
-  xmplib = 'libxmp.dll';
+  {$IFDEF LIBXMP_WINDOZE_STATIC}
+    {$IFDEF USE_XMP_LITE}
+      {$LINKLIB libxmp-lite.a}
+    {$ELSE}
+      {$LINKLIB libxmp.a}
+    {$ENDIF}
   {$ELSE}
-  xmplib = 'libxmp-lite.dll';
+    {$DEFINE XMP_DYNAMIC}
+    {$IFDEF USE_XMP_LITE}
+      const xmplib = 'libxmp-lite.dll';
+    {$ELSE}
+      const xmplib = 'libxmp.dll';
+    {$ENDIF}
   {$ENDIF}
 {$ELSEIF DEFINED(UNIX)}
-  {$IF DEFINED(USE_XMP_FULL)}
-  xmplib = 'libxmp.so';
+  {$DEFINE XMP_DYNAMIC}
+  {$LINKLIB libxmp}
+  {$IFDEF USE_XMP_LITE}
+    const xmplib = 'libxmp-lite.so';
   {$ELSE}
-  xmplib = 'libxmp-lite.so';
+    const xmplib = 'libxmp.so';
   {$ENDIF}
 {$ELSE}
-  {$MESSAGE ERROR 'XMP_DYNAMIC not supported'}
-{$IFEND}
-{$ELSE}
-  {$IF DEFINED(USE_XMP_FULL)}
-  {$LINKLIB libxmp.a}
-  {$ELSE}
-  {$LINKLIB libxmp-lite.a}
-  {$ENDIF}
+  {$ERROR libxmp not supported on this platform. Fix it!}
 {$ENDIF}
 
 const