organized lib folder for windows libs

shiffman · Jul 15, 2015 · 2908ea3 · 2908ea3
1 parent 0877dc7
commit 2908ea3
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 2 deletions.
diff --git a/OpenKinect-Processing/lib/libJNILibfreenect2.dll b/OpenKinect-Processing/lib/libJNILibfreenect2.dll
diff --git a/OpenKinect-Processing/lib/msvc/OpenCL.lib b/OpenKinect-Processing/lib/msvc/OpenCL.lib
diff --git a/OpenKinect-Processing/lib/msvc/libJNILibfreenect2.dll b/OpenKinect-Processing/lib/msvc/libJNILibfreenect2.dll
diff --git a/OpenKinect-Processing/lib/msvc/libusb-1.0.dll b/OpenKinect-Processing/lib/msvc/libusb-1.0.dll
diff --git a/OpenKinect-Processing/lib/msvc/libusb-1.0.lib b/OpenKinect-Processing/lib/msvc/libusb-1.0.lib
diff --git a/OpenKinect-Processing/lib/turbojpeg.dll → OpenKinect-Processing/lib/msvc/turbojpeg.dll b/OpenKinect-Processing/lib/turbojpeg.dll → OpenKinect-Processing/lib/msvc/turbojpeg.dll
diff --git a/OpenKinect-Processing/lib/msvc/turbojpeg.lib b/OpenKinect-Processing/lib/msvc/turbojpeg.lib
diff --git a/OpenKinect-Processing/lib/turbojpeg.lib b/OpenKinect-Processing/lib/turbojpeg.lib
diff --git a/OpenKinect-Processing/src/org/openkinect/freenect2/Device.java b/OpenKinect-Processing/src/org/openkinect/freenect2/Device.java
@@ -49,8 +49,9 @@ public class Device {
 
 		if(osName.indexOf("win") >= 0) {
 			System.out.println(arch + " windows");
-			System.loadLibrary("turbojpeg");
-			System.loadLibrary("libJNILibfreenect2");
+			System.loadLibrary("msvc/turbojpeg");
+			System.loadLibrary("msvc/libusb-1.0");
+			System.loadLibrary("msvc/libJNILibfreenect2");
 		}else if(osName.indexOf("mac") >= 0){
 			System.out.println(arch + " mac");
 			System.loadLibrary("turbojpeg");