Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 1a44015

Browse files
author
Haavar Valeur
committedJan 4, 2014
Replaced the RXTXcomm.jar with nrjavaserial.jar to allow the app to be run on 64 bit java in OS X.
1 parent 3baa0ce commit 1a44015

File tree

5 files changed

+3
-3
lines changed

5 files changed

+3
-3
lines changed
 

‎app/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
encoding="UTF-8"
4545
includeAntRuntime="false"
4646
debug="true"
47-
classpath="../core/core.jar; ${env.JAVA_HOME}/lib/tools.jar; lib/ant.jar; lib/ant-launcher.jar; lib/apple.jar; lib/ecj.jar; lib/jna.jar; lib/RXTXcomm.jar" />
47+
classpath="../core/core.jar; ${env.JAVA_HOME}/lib/tools.jar; lib/ant.jar; lib/ant-launcher.jar; lib/apple.jar; lib/ecj.jar; lib/jna.jar; lib/nrjavaserial.jar" />
4848
<copy todir="bin" overwrite="true" verbose="true">
4949
<fileset dir="src" includes="**/*.properties" />
5050
</copy>

‎app/lib/RXTXcomm.jar

-58.1 KB
Binary file not shown.

‎app/lib/nrjavaserial.jar

566 KB
Binary file not shown.

‎build/build.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
<include name="app/pde.jar" />
2727
<include name="app/lib/ecj.jar" />
2828
<include name="app/lib/jna.jar" />
29-
<include name="app/lib/RXTXcomm.jar" />
29+
<include name="app/lib/nrjavaserial.jar" />
3030
<include name="app/lib/ant.jar" />
3131
<include name="app/lib/ant-launcher.jar" />
3232
</fileset>

‎build/macosx/template.app/Contents/Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
<!-- In 0149, removed /System/Library/Java from the CLASSPATH because
7777
it can cause problems if users have installed weird files there.
7878
http://dev.processing.org/bugs/show_bug.cgi?id=1045 -->
79-
<string>$JAVAROOT/pde.jar:$JAVAROOT/core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/RXTXcomm.jar</string>
79+
<string>$JAVAROOT/pde.jar:$JAVAROOT/core.jar:$JAVAROOT/antlr.jar:$JAVAROOT/ecj.jar:$JAVAROOT/registry.jar:$JAVAROOT/quaqua.jar:$JAVAROOT/nrjavaserial.jar</string>
8080

8181
<key>JVMArchs</key>
8282
<array>

0 commit comments

Comments
 (0)
Please sign in to comment.