Merge pull request #973 from erwincoumans/master

allow to compile/run 64bit version of VR, co-exist of 64bit and 32bit openvr_api.dll
This commit is contained in:
erwincoumans
2017-02-22 17:38:27 -08:00
committed by GitHub
3 changed files with 8 additions and 3 deletions

View File

@@ -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

View File

@@ -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