Skip to content

Commit

Permalink
Merge pull request #31 from processing/gohai-arm
Browse files Browse the repository at this point in the history
Trying to get arm working on master
  • Loading branch information
codeanticode committed Aug 15, 2015
2 parents 2dd6f50 + d10f2fb commit 191e511
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
7 changes: 3 additions & 4 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,13 @@
<fail unless="core-built" message="Please build the core library first and make sure it sits in ${core.classpath.location}/core.jar" />

<mkdir dir="bin" />
<javac source="1.6"
target="1.6"
<javac source="1.7"
target="1.7"
srcdir="src" destdir="bin"
encoding="UTF-8"
includeAntRuntime="false"
classpath="${core.classpath.location}/core.jar; library/gstreamer-java.jar; library/jna.jar"
nowarn="true"
compiler="org.eclipse.jdt.core.JDTCompilerAdapter">
nowarn="true">
<compilerclasspath path="${compiler.classpath.location}/org.eclipse.jdt.core.jar;
${compiler.classpath.location}/jdtCompilerAdapter.jar" />
</javac>
Expand Down
Binary file modified library/jna.jar
Binary file not shown.
8 changes: 7 additions & 1 deletion src/processing/video/Video.java
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ static protected void initImpl() {
gstreamerPluginPath = pluginPath;
}
} else {
// Paths are build automatically from the curren location of the video
// Paths are build automatically from the current location of the video
// library.
if (PApplet.platform == LINUX) {
buildLinuxPaths();
Expand All @@ -114,6 +114,8 @@ static protected void initImpl() {
if (!gstreamerLibPath.equals("")) {
System.setProperty("jna.library.path", gstreamerLibPath);
}
// outputs the paths JNA is trying
//System.setProperty("jna.debug_load", "true");

if (PApplet.platform == WINDOWS) {
LibraryLoader loader = LibraryLoader.getInstance();
Expand Down Expand Up @@ -153,6 +155,10 @@ static protected void removePlugins() {


static protected void buildLinuxPaths() {
// the version of the JNA library bundled automatically tries
// all library paths known to the host system's ldconfig
// so we'd even catch locations like /usr/local/lib etc
// PR for upstream: https://github.com/twall/jna/pull/478
gstreamerLibPath = "";
gstreamerPluginPath = "";
}
Expand Down

0 comments on commit 191e511

Please sign in to comment.