Browse Source

libusb: fixed Windows build. Enabled the package for Win64

git-svn-id: trunk@35602 -
Károly Balogh 8 years ago
parent
commit
4b1ac10e0d
2 changed files with 3 additions and 2 deletions
  1. 1 1
      packages/libusb/fpmake.pp
  2. 2 1
      packages/libusb/src/libusb.pp

+ 1 - 1
packages/libusb/fpmake.pp

@@ -19,7 +19,7 @@ begin
     P.Version:='3.1.1';
     P.Version:='3.1.1';
     P.Description := 'Headers for the libusb library';
     P.Description := 'Headers for the libusb library';
     P.NeedLibC:= true;  // true for headers that indirectly link to libc?
     P.NeedLibC:= true;  // true for headers that indirectly link to libc?
-    P.OSes := [linux,win32];
+    P.OSes := [linux,win32,win64];
 
 
     P.Dependencies.Add('rtl-extra',[linux]);
     P.Dependencies.Add('rtl-extra',[linux]);
 
 

+ 2 - 1
packages/libusb/src/libusb.pp

@@ -48,6 +48,7 @@ uses ctypes,sockets,unixtype;
   type
   type
     ssize_t = longint;
     ssize_t = longint;
 {$endif  WIN64}
 {$endif  WIN64}
+    ptimeval = pointer;
 
 
 {$else}
 {$else}
   type
   type
@@ -100,7 +101,7 @@ uses ctypes,sockets,unixtype;
 {$ifdef MSWINDOWS}
 {$ifdef MSWINDOWS}
  
  
 const libusb1='libusb-1.0.dll';
 const libusb1='libusb-1.0.dll';
-{$define LIBUSB_CALL := WINAPI;external libusb1; }
+{$define LIBUSB_CALL := WINAPI }
 {$else}
 {$else}
 const libusb1='libusb-1.0.so';
 const libusb1='libusb-1.0.so';
 {$define LIBUSB_CALL := cdecl }
 {$define LIBUSB_CALL := cdecl }