Skip to content

mingw-cross build fix #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

mingw-cross build fix #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
[package]
name = "openvr_sys"
version = "2.0.3"
version = "2.0.4"
authors = [
"Colin Sherratt",
"Erick Tryzelaar",
"Rene Eichhorn",
"Benjamin Saunders"
"Benjamin Saunders",
"TiberiusCN"
]
license = "MIT"
description = "Raw unsafe system binding for openvr"
Expand Down
7 changes: 6 additions & 1 deletion build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,12 @@ fn main() {
config.define("BUILD_UNIVERSAL", "OFF");
} else if target_os == "windows" {
// Work around broken cmake build.
config.cxxflag("/DWIN32");
if "gnu" == env::var("CARGO_CFG_TARGET_ENV").unwrap() {
config.cxxflag("-DWIN32");
println!("cargo:rustc-link-lib=dylib=stdc++");
} else {
config.cxxflag("/DWIN32");
}
}

let dst = config.build();
Expand Down
2 changes: 1 addition & 1 deletion openvr
Open in desktop
Submodule openvr updated 30 files
+ − bin/linux32/libopenvr_api.so
+ − bin/linux32/libopenvr_api.so.dbg
+ − bin/linux64/libopenvr_api.so
+ − bin/linux64/libopenvr_api.so.dbg
+ − bin/osx32/libopenvr_api.dylib
+ − bin/osx32/libopenvr_api.dylib.dSYM/Contents/Resources/DWARF/libopenvr_api.dylib
+ − bin/win32/openvr_api.dll
+ − bin/win32/openvr_api.pdb
+ − bin/win64/openvr_api.dll
+ − bin/win64/openvr_api.pdb
+206 −87 headers/openvr.h
+723 −34 headers/openvr_api.cs
+135 −30 headers/openvr_api.json
+84 −28 headers/openvr_capi.h
+154 −8 headers/openvr_driver.h
+ − lib/linux32/libopenvr_api.so
+ − lib/linux64/libopenvr_api.so
+ − samples/bin/linux32/libopenvr_api.so
+ − samples/bin/linux64/libopenvr_api.so
+ − samples/bin/osx32/libopenvr_api.dylib
+ − samples/bin/win32/openvr_api.dll
+ − samples/bin/win64/openvr_api.dll
+1 −1 samples/driver_sample/driver_sample.cpp
+42 −0 src/vrcommon/envvartools_public.cpp
+1 −0 src/vrcommon/envvartools_public.h
+10 −1 src/vrcommon/hmderrors_public.cpp
+13 −4 src/vrcommon/pathtools_public.cpp
+11 −0 src/vrcommon/strtools_public.cpp
+6 −0 src/vrcommon/strtools_public.h
+4 −0 src/vrcommon/vrpathregistry_public.cpp