Mercurial > mxe-octave

changeset 363:630c4769a90d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
don't use static linking for package libusb
author Volker Grabsch <vog@notjusthosting.com>
date Sat, 06 Jun 2009 17:11:31 +0200
parents 04b3d068e943
children b8cd5199077e
files src/libusb.mk
diffstat 1 files changed, 12 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/libusb.mk	Wed Jun 03 17:05:01 2009 +0200
+++ b/src/libusb.mk	Sat Jun 06 17:11:31 2009 +0200
@@ -17,13 +17,19 @@
 endef
 
 define $(PKG)_BUILD
-    # applications which use libusb need to be linked with
-    # -lusb -lusbd -lsetupapi -lntoskrnl
+    # convert DOS line endings
     sed 's,\r$$,,' -i '$(1)/Makefile'
-    echo -e '$$(LIB_TARGET).a: $$(DLL_OBJECTS) $$(DRIVER_OBJECTS)' >> '$(1)/Makefile'
-    echo -e '\t$$(AR) rc $$@ $$^'                                  >> '$(1)/Makefile'
-    echo -e '\t$$(host_prefix)ranlib $$@'                          >> '$(1)/Makefile'
-    $(MAKE) -C '$(1)' -j '$(JOBS)' host_prefix=$(TARGET) libusbd.a libusb.a
+
+    # don't actually build the library (DLL file),
+    # just create the DLL import stubs
+    $(MAKE) -C '$(1)' -j '$(JOBS)' host_prefix=$(TARGET) libusbd.a
+    cd '$(1)' && $(TARGET)-dlltool \
+        --dllname libusb0.dll \
+        --kill-at \
+        --add-stdcall-underscore \
+        --def libusb0.def \
+        --output-lib libusb.a
+
     $(INSTALL) -d '$(PREFIX)/$(TARGET)/include'
     $(INSTALL) -m664 '$(1)/src/usb.h' '$(PREFIX)/$(TARGET)/include/'
     $(INSTALL) -d '$(PREFIX)/$(TARGET)/lib'