fixed linking errors and set up wrapping

Cargo.toml

@@ -1,2 +1,2 @@
 [workspace]
-members = ["libodm"]
+members = ["libodm", "odm"]

libodm/Cargo.toml

@@ -8,7 +8,9 @@ build = "build.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-
+libc = "0.2.95"
+log = "0.4.14"
 
 [build-dependencies]
-cc = "1.0"
+cc = "1.0"
+pkg-config = "0.3.19"

libodm/build.rs

@@ -1,3 +1,18 @@
 fn main() {
-    cc::Build::new().file("cpp/wrapper.cc").flag("-Wno-deprecated").flag("-Wno-deprecated-copy").compile("foo");
+
+    // Compile the LeapMotion wrapper (and Leap itself)
+    cc::Build::new().file("cpp/wrapper.cc").flag("-Wno-deprecated").flag("-Wno-deprecated-copy").flag("-L lib").flag("-lLeap").flag("-lstdc++").compile("foo");
+    // pkg_config::Config::new().probe("Leap").unwrap();
+
+    // Set up the linker to include Leap
+    println!("cargo:rustc-link-search=native=libodm/lib");
+    println!("cargo:rustc-link-lib=Leap");
+
+    // Set up the linker to include stdc++
+    println!("cargo:rustc-link-lib=static-nobundle=stdc++");
+
+    // Make cargo auto-rebuild these files
+    println!("cargo:rerun-if-changed=libodm/build.rs");
+    println!("cargo:rerun-if-changed=libodm/cpp/wrapper.cc");
+    println!("cargo:rerun-if-changed=libodm/cpp/listener.cc");
 }

libodm/cpp/wrapper.cc

@@ -4,18 +4,15 @@
 using namespace Leap;
 
 //---- Start Public Functions ----//
-extern "C"
-{
-    void beginEventLoop();
-    bool isControllerCreated();
-    void endEventLoop();
-    bool imageExists();
-    int getImageHeight();
-    int getImageWidth();
-    int getImageBPP();
-    const unsigned char *getImageLeft();
-    const unsigned char *getImageRight();
-}
+extern "C" void beginEventLoop();
+extern "C" bool isControllerCreated();
+extern "C" void endEventLoop();
+extern "C" bool imageExists();
+extern "C" int getImageHeight();
+extern "C" int getImageWidth();
+extern "C" int getImageBPP();
+extern "C" const unsigned char *getImageLeft();
+extern "C" const unsigned char *getImageRight();
 //---- End Public Functions ----//
 
 //---- Start Globals ----//
@@ -45,10 +42,10 @@ void beginEventLoop()
 
 void endEventLoop()
 {
-    if (controller != nullptr)
-    {
-        delete controller;
-    }
+    // if (controller != nullptr)
+    // {
+    //     delete controller;
+    // }
 }
 
 bool isControllerCreated() { return controller != nullptr; }

libodm/src/leapmotion/device.rs

@@ -0,0 +1,45 @@
+use crate::leapmotion::ffi::endEventLoop;
+
+use super::ffi;
+
+#[derive(Debug)]
+pub enum DeviceError {
+    InstanceError,
+}
+
+pub struct LeapMotionDevice {}
+
+impl LeapMotionDevice {
+
+    /// Creates a LeapMotionDevice by talking to the device driver. This can only be called once
+    pub fn create_device() -> Result<Self, DeviceError> {
+        log::debug!("Creating LeapMotion device access");
+
+        // Handle possible error with multiple instances
+        unsafe {
+            if ffi::isControllerCreated() {
+                log::error!(
+                    "Tried to create access to a LeapMotion device when an instance already exists"
+                );
+                return Err(DeviceError::InstanceError);
+            }
+        }
+
+        // Create an instance along with its handlers
+        unsafe {
+            ffi::beginEventLoop();
+        }
+
+        log::debug!("Device created");
+        Ok(Self {})
+    }
+}
+
+impl Drop for LeapMotionDevice {
+    fn drop(&mut self) {
+        log::debug!("Informing wrapper to deallocate LeapMotion device");
+        unsafe{
+            ffi::endEventLoop();
+        }
+    }
+}

libodm/src/leapmotion/ffi.rs

@@ -0,0 +1,12 @@
+
+extern {
+    pub fn beginEventLoop();
+    pub fn isControllerCreated() -> bool;
+    pub fn endEventLoop();
+    pub fn imageExists() -> bool;
+    pub fn getImageHeight() -> libc::c_int;
+    pub fn getImageWidth()-> libc::c_int;
+    pub fn getImageBPP() -> libc::c_int;
+    pub fn getImageLeft() -> *const u8;
+    pub fn getImageRight()  -> *const u8;
+}

libodm/src/leapmotion/mod.rs

@@ -0,0 +1,2 @@
+pub(self) mod ffi;
+pub mod device; 

libodm/src/lib.rs

@@ -1 +1,3 @@
-mod ffi;
+#![feature(static_nobundle)]
+
+pub mod leapmotion;

odm/Cargo.toml

@@ -0,0 +1,11 @@
+[package]
+name = "odm"
+version = "0.1.0"
+authors = ["Evan Pratten <ewpratten@gmail.com>"]
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+libodm = { version = "0.1.0", path = "../libodm"}
+clap = "2.33.3"

odm/src/main.rs

@@ -0,0 +1,11 @@
+use std::time::Duration;
+
+use libodm::leapmotion::device::LeapMotionDevice;
+
+fn main() {
+    
+    // Init a device
+    let device = LeapMotionDevice::create_device().unwrap();
+
+    std::thread::sleep(Duration::from_secs(1));
+}

rust-toolchain.toml

@@ -0,0 +1,4 @@
+[toolchain]
+channel = "nightly-2021-05-29"
+components = [ "rustfmt", "rustc-dev", "rls" ]
+targets = [ "x86_64-unknown-linux-gnu" ]