Merge pull request #973 from erwincoumans/master

allow to compile/run 64bit version of VR, co-exist of 64bit and 32bit openvr_api.dll
2017-02-22 17:38:27 -08:00
parent 3e1710d48e bb11884f89
commit f15722ffb1
3 changed files with 8 additions and 3 deletions
--- 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
--- a/examples/ThirdPartyLibs/openvr/lib/win64/openvr_api.lib
+++ b/examples/ThirdPartyLibs/openvr/lib/win64/openvr_api.lib