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/ch/ntb
- from Rev 8 to Rev 9
- ↔ Reverse comparison
Rev 8 → Rev 9
/usb/LibusbJava.java
370,18 → 370,26
LibLoader.load( "libusbJava32" ); |
} |
} |
else if ( System.getProperty("os.arch").equalsIgnoreCase("amd64") ) { |
LibLoader.load( "usbJava64" ); |
// System.err.println("loaded libusbJava64"); |
} |
else { |
try { |
LibLoader.load( "usbJavaSh" ); |
// System.err.println("loaded libusbJavaSh"); |
LibLoader.load( "usbJava" ); |
// System.err.println("loaded libusbJava"); |
} |
catch ( UnsatisfiedLinkError e ) { |
LibLoader.load( "usbJavaSt" ); |
// System.err.println("loaded libusbJavaSt"); |
if ( System.getProperty("os.arch").equalsIgnoreCase("amd64") || System.getProperty("os.arch").equalsIgnoreCase("x86_64") ) { |
LibLoader.load( "usbJava64" ); |
// System.err.println("loaded libusbJava64"); |
} |
else { |
try { |
LibLoader.load( "usbJavaSh" ); |
// System.err.println("loaded libusbJavaSh"); |
} |
catch ( UnsatisfiedLinkError e2 ) { |
LibLoader.load( "usbJavaSt" ); |
// System.err.println("loaded libusbJavaSt"); |
} |
} |
} |
} |
// define the error codes |