Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lsl"
version = "0.1.1"
version = "0.1.2"
authors = ["Intheon <contact@intheon.io>", "Christian Kothe <christian.kothe@intheon.io>"]
edition = "2018"
description = "Lab streaming layer (liblsl) bindings for rust."
Expand All @@ -13,7 +13,7 @@ categories = ["api-bindings", "network-programming"]
members = ["lsl-sys"]

[dependencies]
lsl-sys = { version = "0.1.1", path = "lsl-sys" }
lsl-sys = { version = "0.1.2", path = "lsl-sys" }

[dev-dependencies]
rand = "~0.7"
2 changes: 1 addition & 1 deletion lsl-sys/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "lsl-sys"
version = "0.1.1"
version = "0.1.2"
authors = ["Intheon <contact@intheon.io>", "Christian Kothe <christian.kothe@intheon.io>"]
edition = "2018"
description = "Low-level bindings to the system liblsl library (lab streaming layer)."
Expand Down
12 changes: 10 additions & 2 deletions lsl-sys/build.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
use std::env;
use std::path::Path;

fn main() {
// TODO: find out if liblsl already present on system and usable (if so, link to that instead)
// println!("cargo:warning={}", "rebuilding...");
println!("cargo:warning={}", "Building LSL from soruce...");
build_liblsl();
}

Expand All @@ -15,6 +15,14 @@ fn build_liblsl() {
cfg
.define("LSL_NO_FANCY_LIBNAME", "ON")
.define("LSL_BUILD_STATIC", "ON");

// Disable framework build on macOS
// It doesn't work otherwise
#[cfg(target_os = "macos")]
{
cfg.define("LSL_FRAMEWORK", "OFF");
}

if target.contains("msvc") {
// override some C/CXX flags that the cmake crate splices in on Windows
// (these cause the build to fail)...
Expand Down
2 changes: 1 addition & 1 deletion lsl-sys/liblsl
Submodule liblsl updated 2043 files