URL
https://opencores.org/ocsvn/usb_fpga_1_2/usb_fpga_1_2/trunk
Subversion Repositories usb_fpga_1_2
Compare Revisions
- This comparison shows the changes necessary to convert path
/usb_fpga_1_2/trunk/libusbJava-src
- from Rev 3 to Rev 4
- ↔ Reverse comparison
Rev 3 → Rev 4
/ch/ntb/usb/LibusbJava.java
363,7 → 363,14
if (os.contains("Windows")) { |
LibLoader.load( "libusbJava" ); |
} else { |
LibLoader.load( "usbJava" ); |
try { |
LibLoader.load( "usbJavaSh" ); |
// System.err.println("loaded libusbJavaSh"); |
} |
catch ( UnsatisfiedLinkError e ) { |
LibLoader.load( "usbJavaSt" ); |
// System.err.println("loaded libusbJavaSt"); |
} |
} |
// define the error codes |
ERROR_SUCCESS = 0; |
/Makefile
29,7 → 29,8
LIBEXTRADEPS=LibusbJava.h |
JAVASRCS=$(shell echo ch/ntb/usb/*.java) $(shell echo ch/ntb/usb/logger/*.java) |
|
LIBTARGET=libusbJava.so |
LIBTARGET_SH=libusbJavaSh.so |
LIBTARGET_ST=libusbJavaSt.so |
LIBLIBS=-lusb |
LIBINCS=-I $(JAVAPREFIX)/include -I $(JAVAPREFIX)/include/linux |
|
39,11 → 40,14
|
classes: classes.made |
|
libs: $(LIBTARGET) |
libs: $(LIBTARGET_SH) $(LIBTARGET_ST) |
|
$(LIBTARGET): $(LIBSRCS) $(LIBEXTRADEPS) |
$(GCC) -shared -std=c99 -Wall -Wl,-static,-soname,$(LIBTARGET) $(LIBINCS) -static $(LIBSRCS) -o $(LIBTARGET) $(LIBLIBS) |
$(LIBTARGET_ST): $(LIBSRCS) $(LIBEXTRADEPS) |
$(GCC) -shared -std=c99 -Wall -Wl,-static,-soname,$(LIBTARGET_ST) $(LIBINCS) -static $(LIBSRCS) -o $(LIBTARGET_ST) $(LIBLIBS) |
|
$(LIBTARGET_SH): $(LIBSRCS) $(LIBEXTRADEPS) |
$(GCC) -shared -std=c99 -Wall -Wl,-soname,$(LIBTARGET_SH) $(LIBINCS) $(LIBSRCS) -o $(LIBTARGET_SH) $(LIBLIBS) |
|
classes.made: $(JAVASRCS) |
$(JAVAC) $(JAVASRCS) |
echo > classes.made |
53,7 → 57,8
|
install2: all |
$(INSTALLDIR) ../libusbJava/ch/ntb/usb/logger |
$(INSTALLFILE) $(LIBTARGET) ../libusbJava |
$(INSTALLFILE) $(LIBTARGET_SH) ../libusbJava |
$(INSTALLFILE) $(LIBTARGET_ST) ../libusbJava |
$(INSTALLFILE) ch/ntb/usb/*.class ../libusbJava/ch/ntb/usb |
$(INSTALLFILE) ch/ntb/usb/logger/*.class ../libusbJava/ch/ntb/usb/logger |
|
61,4 → 66,4
$(RM) *.o |
|
distclean: |
$(RM) $(LIBTARGET) ch/ntb/usb/*.class ch/ntb/usb/logger/*.class classes.made |
$(RM) $(LIBTARGET_SH) $(LIBTARGET_ST) ch/ntb/usb/*.class ch/ntb/usb/logger/*.class classes.made |