Skip to content

Commit

Permalink
jAER: add javacv/javacpp source zips. Reference them in both Eclipse …
Browse files Browse the repository at this point in the history
…and NetBeans.

Update jAER.jar with latest changes.


git-svn-id: https://svn.code.sf.net/p/jaer/code/jAER/trunk@8420 b7f4320f-462c-0410-a916-d9f35bb82d52
  • Loading branch information
llongi committed Apr 1, 2016
1 parent 2969c5b commit 78a0abf
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="subprojects/JSpikeStack/src"/>
<classpathentry kind="lib" path="jars/javacv/javacpp.jar"/>
<classpathentry kind="lib" path="jars/javacv/javacv.jar"/>
<classpathentry kind="lib" path="jars/javacv/javacpp.jar" sourcepath="jars/javacv/javacpp-1.1-src.zip"/>
<classpathentry kind="lib" path="jars/javacv/javacv.jar" sourcepath="jars/javacv/javacv-1.1-src.zip"/>
<classpathentry kind="lib" path="jars/swing-layout-1.0.4.jar"/>
<classpathentry kind="lib" path="jars/UsbIoJava.jar"/>
<classpathentry kind="lib" path="jars/commons-net-3.4.jar">
Expand Down
Binary file modified dist/jAER.jar
Binary file not shown.
Binary file added jars/javacv/javacpp-1.1-src.zip
Binary file not shown.
Binary file added jars/javacv/javacv-1.1-src.zip
Binary file not shown.
4 changes: 4 additions & 0 deletions nbproject/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ file.reference.commons-math3-3.6.1.jar=jars/commons-math3-3.6.1.jar
file.reference.commons-net-3.4.jar=jars/commons-net-3.4.jar
file.reference.gluegen-rt.jar=jars/jogl/gluegen-rt.jar
file.reference.javacpp.jar=jars/javacv/javacpp.jar
file.reference.javacv.jar=jars/javacv/javacv.jar
file.reference.javax.mail-1.5.0.jar=jars/javax.mail-1.5.0.jar
file.reference.jblas-1.2.4.jar=jars/jblas-1.2.4.jar
file.reference.JEvtLearn.jar=jars/JEvtLearn.jar
Expand Down Expand Up @@ -85,6 +86,7 @@ javac.classpath=\
${file.reference.commons-net-3.4.jar}:\
${file.reference.gluegen-rt.jar}:\
${file.reference.javacpp.jar}:\
${file.reference.javacv.jar}:\
${file.reference.javax.mail-1.5.0.jar}:\
${file.reference.jblas-1.2.4.jar}:\
${file.reference.jlfgr-1.0.jar}:\
Expand Down Expand Up @@ -165,6 +167,8 @@ run.test.classpath=\
${javac.test.classpath}:\
${build.test.classes.dir}
source.encoding=UTF-8
source.reference.javacpp.jar=jars/javacv/javacpp-1.1-src.zip!/javacpp/src/main/java/
source.reference.javacv.jar=jars/javacv/javacv-1.1-src.zip!/javacv/src/main/java/
src.dir=${file.reference.java-src}
test.src.dir=test

Expand Down

0 comments on commit 78a0abf

Please sign in to comment.