fixed .def generation broken by previous commitpbr303

1 files changed, 4 insertions, 2 deletions

diff --git a/autogen.sh b/autogen.sh
index 5a26ef1..316052e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,7 +6,8 @@ create_def()
   echo "rebuidling libusb-1.0.def file"
   echo "LIBRARY" > libusb/libusb-1.0.def
   echo "EXPORTS" >> libusb/libusb-1.0.def
-  sed -n -e "s/.*API_EXPORTED.*\([[:blank:]]\)\(.*\)(.*/  \2/p" libusb/*.c >> libusb/libusb-1.0.def
+  sed -n -e "s/.*API_EXPORTED.*\([[:blank:]]\)\(libusb.*\)(.*/  \2/p" libusb/*.c >> libusb/libusb-1.0.def
+  sed -n -e "s/.*LIBUSB_CALL.*\([[:blank:]]\)\(libusb.*\)(.*/  \2/p" libusb/*.c >> libusb/libusb-1.0.def
   # We need to manually define a whole set of DLL aliases if we want the MS
   # DLLs to be usable with dynamically linked MinGW executables. This is
   # because it is not possible to avoid the @ decoration from import WINAPI
@@ -15,7 +16,8 @@ create_def()
   # Currently, the maximum size is 32 and all sizes are multiples of 4
   for i in 4 8 12 16 20 24 28 32
   do
-    sed -n -e "s/.*API_EXPORTED.*\([[:blank:]]\)\(.*\)(.*/  \2@$i = \2/p" libusb/*.c >> libusb/libusb-1.0.def
+    sed -n -e "s/.*API_EXPORTED.*\([[:blank:]]\)\(libusb.*\)(.*/  \2@$i = \2/p" libusb/*.c >> libusb/libusb-1.0.def
+    sed -n -e "s/.*LIBUSB_CALL.*\([[:blank:]]\)\(libusb.*\)(.*/  \2@$i = \2/p" libusb/*.c >> libusb/libusb-1.0.def
   done
 }