97 lines
3.0 KiB
Diff
97 lines
3.0 KiB
Diff
|
diff -Nru src/CommPortIdentifier.java src-gil/CommPortIdentifier.java
|
||
|
|
--- src/CommPortIdentifier.java 2004-10-12 10:59:27.000000000 +0200
|
||
|
|
+++ src-gil/CommPortIdentifier.java 2010-03-09 16:07:18.000000000 +0100
|
||
|
|
@@ -80,7 +80,7 @@
|
||
|
|
if (debug)
|
||
|
|
System.out.println("Have not implemented native_psmisc_report_owner(PortName)); in CommPortIdentifier");
|
||
|
|
}
|
||
|
|
- System.loadLibrary( "rxtxSerial" );
|
||
|
|
+ System.load("@JNIPATH@/" + System.mapLibraryName( "rxtxSerial" ));
|
||
|
|
}
|
||
|
|
CommPortIdentifier ( String pn, CommPort cp, int pt, CommDriver driver)
|
||
|
|
{
|
||
|
|
diff -Nru src/I2C.java src-gil/I2C.java
|
||
|
|
--- src/I2C.java 2004-10-12 10:59:27.000000000 +0200
|
||
|
|
+++ src-gil/I2C.java 2010-03-09 16:07:55.000000000 +0100
|
||
|
|
@@ -35,7 +35,7 @@
|
||
|
|
|
||
|
|
static
|
||
|
|
{
|
||
|
|
- System.loadLibrary( "rxtxI2C" );
|
||
|
|
+ System.load("@JNIPATH@/" + System.mapLibraryName( "rxtxI2C" ));
|
||
|
|
Initialize();
|
||
|
|
}
|
||
|
|
|
||
|
|
diff -Nru src/LPRPort.java src-gil/LPRPort.java
|
||
|
|
--- src/LPRPort.java 2004-10-12 10:59:27.000000000 +0200
|
||
|
|
+++ src-gil/LPRPort.java 2010-03-09 16:24:04.000000000 +0100
|
||
|
|
@@ -32,7 +32,7 @@
|
||
|
|
{
|
||
|
|
|
||
|
|
static {
|
||
|
|
- System.loadLibrary( "rxtxParallel" );
|
||
|
|
+ System.load("@JNIPATH@/" + System.mapLibraryName( "rxtxParallel" ));
|
||
|
|
Initialize();
|
||
|
|
}
|
||
|
|
|
||
|
|
diff -Nru src/Raw.java src-gil/Raw.java
|
||
|
|
--- src/Raw.java 2004-10-12 10:59:27.000000000 +0200
|
||
|
|
+++ src-gil/Raw.java 2010-03-09 16:12:20.000000000 +0100
|
||
|
|
@@ -32,7 +32,7 @@
|
||
|
|
|
||
|
|
static
|
||
|
|
{
|
||
|
|
- System.loadLibrary( "rxtxRaw" );
|
||
|
|
+ System.load("@JNIPATH@/" + System.mapLibraryName( "rxtxRaw" ));
|
||
|
|
Initialize();
|
||
|
|
}
|
||
|
|
|
||
|
|
diff -Nru src/RS485.java src-gil/RS485.java
|
||
|
|
--- src/RS485.java 2004-10-12 10:59:27.000000000 +0200
|
||
|
|
+++ src-gil/RS485.java 2010-03-09 16:08:57.000000000 +0100
|
||
|
|
@@ -32,7 +32,7 @@
|
||
|
|
|
||
|
|
static
|
||
|
|
{
|
||
|
|
- System.loadLibrary( "rxtxRS485" );
|
||
|
|
+ System.load("@JNIPATH@/" + System.mapLibraryName( "rxtxRS485" ));
|
||
|
|
Initialize();
|
||
|
|
}
|
||
|
|
|
||
|
|
diff -Nru src/RXTXCommDriver.java src-gil/RXTXCommDriver.java
|
||
|
|
--- src/RXTXCommDriver.java 2006-01-30 05:37:49.000000000 +0100
|
||
|
|
+++ src-gil/RXTXCommDriver.java 2010-03-09 16:19:51.000000000 +0100
|
||
|
|
@@ -42,7 +42,7 @@
|
||
|
|
static
|
||
|
|
{
|
||
|
|
if(debug ) System.out.println("RXTXCommDriver {}");
|
||
|
|
- System.loadLibrary( "rxtxSerial" );
|
||
|
|
+ System.load("@JNIPATH@/" + System.mapLibraryName( "rxtxSerial" ));
|
||
|
|
|
||
|
|
/*
|
||
|
|
Perform a crude check to make sure people don't mix
|
||
|
|
diff -Nru src/RXTXPort.java src-gil/RXTXPort.java
|
||
|
|
--- src/RXTXPort.java 2006-01-30 03:50:57.000000000 +0100
|
||
|
|
+++ src-gil/RXTXPort.java 2010-03-09 16:18:04.000000000 +0100
|
||
|
|
@@ -51,7 +51,7 @@
|
||
|
|
|
||
|
|
if(debug )
|
||
|
|
z.reportln( "RXTXPort {}");
|
||
|
|
- System.loadLibrary( "rxtxSerial" );
|
||
|
|
+ System.load("@JNIPATH@/" + System.mapLibraryName( "rxtxSerial" ));
|
||
|
|
Initialize();
|
||
|
|
}
|
||
|
|
|
||
|
|
diff -Nru src/RXTXVersion.java src-gil/RXTXVersion.java
|
||
|
|
--- src/RXTXVersion.java 2006-01-29 23:19:04.000000000 +0100
|
||
|
|
+++ src-gil/RXTXVersion.java 2010-03-09 16:11:22.000000000 +0100
|
||
|
|
@@ -36,7 +36,7 @@
|
||
|
|
private static String Version;
|
||
|
|
|
||
|
|
static {
|
||
|
|
- System.loadLibrary( "rxtxSerial" );
|
||
|
|
+ System.load("@JNIPATH@/" + System.mapLibraryName("rxtxSerial"));
|
||
|
|
Version = "RXTX-2.1-7";
|
||
|
|
}
|
||
|
|
/**
|