diff options
| author | Erwin Coumans <erwin.coumans@gmail.com> | 2017-02-22 15:50:09 -0800 |
|---|---|---|
| committer | Erwin Coumans <erwin.coumans@gmail.com> | 2017-02-22 15:50:09 -0800 |
| commit | 0b27edf1721db05ce8bf952be0abf3117abd94e2 (patch) | |
| tree | f5c3f1e0f78d3fffd893b3a8bf209bef229a0dbb | |
| parent | bd30ba30ce52ac08cb42a39518fe61b6803afb3b (diff) | |
| download | bullet3-0b27edf1721db05ce8bf952be0abf3117abd94e2.tar.gz | |
allow to compile/run 64bit version of VR lib, workaround for issue that both 32bit and 64bit version is called openvr_api.dll
Now 64bit version is called openvr64pi.dll (patched the 64bit binary library openvr_api.lib)
See also https://github.com/ValveSoftware/openvr/issues/412
| -rw-r--r-- | build_visual_studio_vr_pybullet_double.bat | 5 | ||||
| -rw-r--r-- | examples/SharedMemory/premake4.lua | 6 | ||||
| -rw-r--r-- | examples/ThirdPartyLibs/openvr/lib/win64/openvr_api.lib | bin | 5668 -> 5668 bytes |
3 files changed, 8 insertions, 3 deletions
diff --git a/build_visual_studio_vr_pybullet_double.bat b/build_visual_studio_vr_pybullet_double.bat index f4c43cbb5..3fadb9253 100644 --- a/build_visual_studio_vr_pybullet_double.bat +++ b/build_visual_studio_vr_pybullet_double.bat @@ -1,8 +1,9 @@ IF NOT EXIST bin mkdir bin IF NOT EXIST bin\openvr_api.dll copy examples\ThirdPartyLibs\openvr\bin\win32\openvr_api.dll bin +IF NOT EXIST bin\openvr64pi.dll copy examples\ThirdPartyLibs\openvr\bin\win64\openvr_api.dll bin\openvr64pi.dll + +#aargh, see https://github.com/ValveSoftware/openvr/issues/412 -#optionally, hardcode the python path or -#SET myvar=c:\python-3.5.3 #find a python version (hopefully just 1) and use this dir c:\python* /b /ad > tmp1234.txt diff --git a/examples/SharedMemory/premake4.lua b/examples/SharedMemory/premake4.lua index 6ab6ad0fe..e14a0146b 100644 --- a/examples/SharedMemory/premake4.lua +++ b/examples/SharedMemory/premake4.lua @@ -318,7 +318,11 @@ if os.is("Windows") then "../ThirdPartyLibs/openvr/samples/shared/Vectors.h", } if os.is("Windows") then - libdirs {"../ThirdPartyLibs/openvr/lib/win32"} + configuration {"x32"} + libdirs {"../ThirdPartyLibs/openvr/lib/win32"} + configuration {"x64"} + libdirs {"../ThirdPartyLibs/openvr/lib/win64"} + configuration{} end if os.is("Linux") then initX11() end diff --git a/examples/ThirdPartyLibs/openvr/lib/win64/openvr_api.lib b/examples/ThirdPartyLibs/openvr/lib/win64/openvr_api.lib Binary files differindex fc16c9496..9fdab5635 100644 --- a/examples/ThirdPartyLibs/openvr/lib/win64/openvr_api.lib +++ b/examples/ThirdPartyLibs/openvr/lib/win64/openvr_api.lib |