diff --git a/libodm/build.rs b/libodm/build.rs index 0bd7048..190fb3c 100644 --- a/libodm/build.rs +++ b/libodm/build.rs @@ -1,11 +1,11 @@ fn main() { // 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"); + cc::Build::new().file("cpp/wrapper.cc").flag("-Wno-deprecated").flag("-Wno-deprecated-copy").flag("-L dist").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-search=native=libodm/dist"); println!("cargo:rustc-link-lib=Leap"); // Set up the linker to include stdc++ diff --git a/libodm/cpp/wrapper.cc b/libodm/cpp/wrapper.cc index e6a50c1..164e6d7 100644 --- a/libodm/cpp/wrapper.cc +++ b/libodm/cpp/wrapper.cc @@ -1,5 +1,5 @@ #include -#include "../lib/Leap.h" +#include "../dist/Leap.h" using namespace Leap; diff --git a/libodm/lib/Leap.h b/libodm/dist/Leap.h similarity index 100% rename from libodm/lib/Leap.h rename to libodm/dist/Leap.h diff --git a/libodm/lib/LeapMath.h b/libodm/dist/LeapMath.h similarity index 100% rename from libodm/lib/LeapMath.h rename to libodm/dist/LeapMath.h diff --git a/libodm/lib/libLeap.so b/libodm/dist/libLeap.so similarity index 100% rename from libodm/lib/libLeap.so rename to libodm/dist/libLeap.so diff --git a/odm.sh b/odm.sh index 2619bdb..6513d46 100755 --- a/odm.sh +++ b/odm.sh @@ -7,4 +7,4 @@ echo "Enabling core dumps" ulimit -c unlimited echo "Starting cargo with new flags" -LD_LIBRARY_PATH="$(pwd)/libodm/lib:$LD_LIBRARY_PATH" cargo run $@ \ No newline at end of file +LD_LIBRARY_PATH="$(pwd)/libodm/dist:$LD_LIBRARY_PATH" cargo run $@ \ No newline at end of file diff --git a/scripts/inspect-core.sh b/scripts/inspect-core.sh index de64444..073538d 100755 --- a/scripts/inspect-core.sh +++ b/scripts/inspect-core.sh @@ -2,4 +2,4 @@ set -e -LD_LIBRARY_PATH="$(pwd)/libodm/lib:$LD_LIBRARY_PATH" gdb ./target/debug/odm \ No newline at end of file +LD_LIBRARY_PATH="$(pwd)/libodm/dist:$LD_LIBRARY_PATH" gdb ./target/debug/odm \ No newline at end of file