Browse files

changed linking of libfreenect to static (libusb-1.0 still needs to b…

…e installed)
  • Loading branch information...
1 parent defd5e0 commit 90afdbd4f7bfbc5f3912b4296d483bc9d9eeb7b1 Michael Nischt committed Nov 29, 2010
View
8 wrappers/java/build.sh
@@ -1,9 +1,9 @@
#!/bin/sh
-LIBUSB_INCLUDE=/usr/include/libusb-1.0/
-LIBUSB_LIBRARY=/usr/lib/libusb-1.0.a
+LIBUSB_INCLUDE=-I/usr/include/libusb-1.0
+LIBUSB_LIBRARY=-lusb-1.0
-LIBFREENET_INCLUDE=../../include/
+LIBFREENET_INCLUDE=-I../../include/
LIBFREENET_LIBRARY=../../lib/libfreenect.a
# -- try to use installed as fallback
@@ -19,7 +19,7 @@ JAVA_SRC_DIR=OpenKinect/src
mkdir -p dist/javadoc
-g++ -shared -fPIC -Wall -o dist/libOpenKinect.so ${JNI_SRC_DIR}/org_openkinect_Context.cpp OpenKinectJNI/org_openkinect_Device.cpp -I/usr/include/libusb-1.0/ -lusb -I${LIBFREENET_INCLUDE} -L${LIBFREENET_LIBRARY} -I${JDK_HOME}/include/ -I${JDK_HOME}/include/linux/ -L${JDK_HOME}/lib/
+g++ -m64 -shared -fPIC -Wall -o dist/libOpenKinect.so ${JNI_SRC_DIR}/org_openkinect_Context.cpp OpenKinectJNI/org_openkinect_Device.cpp ${LIBUSB_INCLUDE} ${LIBUSB_LIBRARY} ${LIBFREENET_INCLUDE} ${LIBFREENET_LIBRARY} -I${JDK_HOME}/include/ -I${JDK_HOME}/include/linux/ -L${JDK_HOME}/lib/
mkdir -p build
View
BIN wrappers/java/dist/OpenKinect.jar
Binary file not shown.
View
2 wrappers/java/dist/javadoc/allclasses-frame.html
@@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 23:14:43 CET 2010 -->
<TITLE>
All Classes
</TITLE>
View
2 wrappers/java/dist/javadoc/allclasses-noframe.html
@@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 23:14:43 CET 2010 -->
<TITLE>
All Classes
</TITLE>
View
2 wrappers/java/dist/javadoc/constant-values.html
@@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 23:14:43 CET 2010 -->
<TITLE>
Constant Field Values
</TITLE>
View
2 wrappers/java/dist/javadoc/deprecated-list.html
@@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 23:14:43 CET 2010 -->
<TITLE>
Deprecated List
</TITLE>
View
2 wrappers/java/dist/javadoc/help-doc.html
@@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 23:14:43 CET 2010 -->
<TITLE>
API Help
</TITLE>
View
2 wrappers/java/dist/javadoc/index-all.html
@@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 23:14:43 CET 2010 -->
<TITLE>
Index
</TITLE>
View
2 wrappers/java/dist/javadoc/index.html
@@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc on Mon Nov 29 11:39:15 CET 2010-->
+<!-- Generated by javadoc on Mon Nov 29 23:14:43 CET 2010-->
<TITLE>
Generated Documentation (Untitled)
</TITLE>
View
2 wrappers/java/dist/javadoc/org/openkinect/Acceleration.html
@@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 23:14:43 CET 2010 -->
<TITLE>
Acceleration
</TITLE>
View
2 wrappers/java/dist/javadoc/org/openkinect/ColorFormat.html
@@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 23:14:43 CET 2010 -->
<TITLE>
ColorFormat
</TITLE>
View
2 wrappers/java/dist/javadoc/org/openkinect/Context.html
@@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 23:14:43 CET 2010 -->
<TITLE>
Context
</TITLE>
View
2 wrappers/java/dist/javadoc/org/openkinect/DepthFormat.html
@@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 23:14:43 CET 2010 -->
<TITLE>
DepthFormat
</TITLE>
View
2 wrappers/java/dist/javadoc/org/openkinect/Device.html
@@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 23:14:43 CET 2010 -->
<TITLE>
Device
</TITLE>
View
2 wrappers/java/dist/javadoc/org/openkinect/Image.html
@@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 23:14:43 CET 2010 -->
<TITLE>
Image
</TITLE>
View
2 wrappers/java/dist/javadoc/org/openkinect/LEDStatus.html
@@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 23:14:43 CET 2010 -->
<TITLE>
LEDStatus
</TITLE>
View
2 wrappers/java/dist/javadoc/org/openkinect/LogLevel.html
@@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 23:14:43 CET 2010 -->
<TITLE>
LogLevel
</TITLE>
View
2 wrappers/java/dist/javadoc/org/openkinect/Logger.html
@@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 23:14:43 CET 2010 -->
<TITLE>
Logger
</TITLE>
View
2 wrappers/java/dist/javadoc/org/openkinect/package-frame.html
@@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 23:14:43 CET 2010 -->
<TITLE>
org.openkinect
</TITLE>
View
2 wrappers/java/dist/javadoc/org/openkinect/package-summary.html
@@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 23:14:43 CET 2010 -->
<TITLE>
org.openkinect
</TITLE>
View
4 wrappers/java/dist/javadoc/org/openkinect/package-tree.html
@@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 23:14:43 CET 2010 -->
<TITLE>
org.openkinect Class Hierarchy
</TITLE>
@@ -101,7 +101,7 @@
<LI TYPE="circle">java.lang.Object<UL>
<LI TYPE="circle">java.lang.Enum&lt;E&gt; (implements java.lang.Comparable&lt;T&gt;, java.io.Serializable)
<UL>
-<LI TYPE="circle">org.openkinect.<A HREF="../../org/openkinect/ColorFormat.html" title="enum in org.openkinect"><B>ColorFormat</B></A><LI TYPE="circle">org.openkinect.<A HREF="../../org/openkinect/LEDStatus.html" title="enum in org.openkinect"><B>LEDStatus</B></A><LI TYPE="circle">org.openkinect.<A HREF="../../org/openkinect/DepthFormat.html" title="enum in org.openkinect"><B>DepthFormat</B></A><LI TYPE="circle">org.openkinect.<A HREF="../../org/openkinect/LogLevel.html" title="enum in org.openkinect"><B>LogLevel</B></A></UL>
+<LI TYPE="circle">org.openkinect.<A HREF="../../org/openkinect/DepthFormat.html" title="enum in org.openkinect"><B>DepthFormat</B></A><LI TYPE="circle">org.openkinect.<A HREF="../../org/openkinect/LogLevel.html" title="enum in org.openkinect"><B>LogLevel</B></A><LI TYPE="circle">org.openkinect.<A HREF="../../org/openkinect/ColorFormat.html" title="enum in org.openkinect"><B>ColorFormat</B></A><LI TYPE="circle">org.openkinect.<A HREF="../../org/openkinect/LEDStatus.html" title="enum in org.openkinect"><B>LEDStatus</B></A></UL>
</UL>
</UL>
<HR>
View
2 wrappers/java/dist/javadoc/overview-tree.html
@@ -2,7 +2,7 @@
<!--NewPage-->
<HTML>
<HEAD>
-<!-- Generated by javadoc (build 1.6.0_21) on Mon Nov 29 11:39:15 CET 2010 -->
+<!-- Generated by javadoc (build 1.6.0_22) on Mon Nov 29 23:14:43 CET 2010 -->
<TITLE>
Class Hierarchy
</TITLE>
View
BIN wrappers/java/dist/libOpenKinect.so
Binary file not shown.

0 comments on commit 90afdbd

Please sign in to comment.