rusefi
/
usb4java
mirror of https://github.com/rusefi/usb4java.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Swith C code to use org.libusb4java. Update references.

This commit is contained in:
Luca Longinotti 2014-02-15 19:25:25 +01:00
parent 278f7e52ca
commit 52391df006
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pom.xml
View File

@ -195,7 +195,7 @@
<configuration>
<classifier>no-natives</classifier>
<excludes>
<exclude>org/usb4java/libusb/*-*/**</exclude>
<exclude>org/libusb4java/*-*/**</exclude>
</excludes>
</configuration>
</execution>
@ -206,7 +206,7 @@
<configuration>
<classifier>natives</classifier>
<includes>
<include>org/usb4java/libusb/*-*/**</include>
<include>org/libusb4java/*-*/**</include>
</includes>
</configuration>
</execution>

6
src/main/c/README
View File

@ -23,7 +23,7 @@ When compilation was successful then you can find the library in the
number (Examples: libusb4java.so, libusb4java.dylib, libusb4java.dll).
usb4java searches for the library in the CLASSPATH directory
`org/usb4java/libusb/<OS>-<ARCH>/`. On a 32 bit x86 linux machine for
example the directory name is `org/usb4java/libusb/linux-x86`. Usually
`org/libusb4java/<OS>-<ARCH>/`. On a 32 bit x86 linux machine for
example the directory name is `org/libusb4java/linux-x86`. Usually
you can find the required name in the exception thrown by usb4java when it
does not find the required library.
does not find the required library.

2
src/main/c/build/common.sh
View File

@ -28,7 +28,7 @@ build()
LIBUSB_URL="http://downloads.sf.net/project/libusb/libusb-1.0/$LIBUSB_NAME/$LIBUSB_ARCHIVE"
fi
DISTDIR="$SRCDIR/../resources/org/usb4java/libusb/$OS-$ARCH"
DISTDIR="$SRCDIR/../resources/org/libusb4java/$OS-$ARCH"
# Only Windows needs the shared library, the others want static ones.
if [ "$OS" = "windows" ]

4
src/main/c/src/usb4java.h
View File

@ -11,8 +11,8 @@
#include <libusb.h>
#include "config.h"
#define PACKAGE_DIR "org/usb4java/libusb"
#define METHOD_NAME(CLASS_NAME, METHOD_NAME) Java_org_usb4java_libusb_##CLASS_NAME##_##METHOD_NAME
#define PACKAGE_DIR "org/libusb4java"
#define METHOD_NAME(CLASS_NAME, METHOD_NAME) Java_org_libusb4java_##CLASS_NAME##_##METHOD_NAME
#if SIZEOF_VOID_P == 4
# define jptr jint