Browse Source

+ fix and enable compilation of libjack for Win32 and Win64

Nikolay Nikolov 7 months ago
parent
commit
0d11caa47d
3 changed files with 8 additions and 2 deletions
  1. 1 1
      packages/libjack/fpmake.pp
  2. 6 0
      packages/libjack/src/jack.pp
  3. 1 1
      packages/libjack/src/weakmacros.inc

+ 1 - 1
packages/libjack/fpmake.pp

@@ -24,7 +24,7 @@ begin
     P.Email := '';
     P.Description := 'Headers for the JACK Audio Connection Kit library';
     P.NeedLibC:= true;  // true for headers that indirectly link to libc?
-    P.OSes := AllUnixOSes-[qnx];
+    P.OSes := AllUnixOSes+[win32,win64]-[qnx];
     P.SourcePath.Add('src');
     P.IncludePath.Add('src');
 

+ 6 - 0
packages/libjack/src/jack.pp

@@ -34,7 +34,13 @@ uses
 {$ENDIF FPC_DOTTEDUNITS}
 
 const
+{$if defined(win32)}
+  libjack = 'libjack';
+{$else if defined(win64)}
+  libjack = 'libjack64';
+{$else}
   libjack = 'jack';
+{$endif}
 
 type
   uint64_t = System.UInt64;

+ 1 - 1
packages/libjack/src/weakmacros.inc

@@ -40,7 +40,7 @@
 {$define JACK_NET_OPTIONAL_WEAK_EXPORT := external libjacknet}
 {$define JACK_NET_OPTIONAL_WEAK_DEPRECATED_EXPORT := external libjacknet; deprecated}
 
-{$if defined(haiku) or defined(aix)}
+{$if defined(haiku) or defined(aix) or defined(win32) or defined(win64)}
   // target does not support weakexternal
   {$define JACK_WEAK_EXPORT := external libjack}
 {$else}