diff --git a/.gitignore b/.gitignore index 6f824d8..86f82f7 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,6 @@ obj /*.sdf bin + +# Visual Studio generated +.vs diff --git a/openvrsimplexamples/openvrsimplexamples.vcxproj b/openvrsimplexamples/openvrsimplexamples.vcxproj index fd33f33..7596cb3 100644 --- a/openvrsimplexamples/openvrsimplexamples.vcxproj +++ b/openvrsimplexamples/openvrsimplexamples.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,18 +21,19 @@ {AA7C3F03-1386-4856-8F6E-38672A296D42} Win32Proj PruebasOpenVR + 10.0 Application true - v110 + v142 Unicode Application false - v110 + v142 true Unicode @@ -50,13 +51,17 @@ true + $(SolutionDir)\thirdparty\sdl2_ttf-2.0.14\include;$(SolutionDir)\thirdparty\sdl2-2.0.3\include;$(SolutionDir)\thirdparty\openvr\headers;$(ProjectDir)include;$(IncludePath) + bin\$(Configuration) + obj\$(Configuration) false - bin/$(Configuration)/ - obj/$(Configuration)/ - $(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib - $(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); + bin\$(Configuration) + obj\$(Configuration) + $(VC_ReferencesPath_x86); + $(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86) + $(SolutionDir)\thirdparty\sdl2_ttf-2.0.14\include;$(SolutionDir)\thirdparty\sdl2-2.0.3\include;$(SolutionDir)\thirdparty\openvr\headers;$(ProjectDir)include;$(IncludePath) @@ -69,7 +74,14 @@ Console true + $(SolutionDir)\thirdparty\openvr\lib\win32\openvr_api.lib;$(SolutionDir)\thirdparty\sdl2-2.0.3\bin\win32\SDL2.lib;$(SolutionDir)\thirdparty\sdl2-2.0.3\bin\win32\SDL2_static.lib;$(SolutionDir)\thirdparty\sdl2-2.0.3\bin\win32\SDL2main.lib;$(SolutionDir)\thirdparty\sdl2_ttf-2.0.14\lib\x86\SDL2_ttf.lib;%(AdditionalDependencies) + + + copy /Y "$(SolutionDir)\thirdparty\sdl2_ttf-2.0.14\lib\x86\*.dll" "$(OutDir)" + copy /Y "$(SolutionDir)\thirdparty\sdl2-2.0.3\bin\win32\*.dll" "$(OutDir)" + copy /Y "$(SolutionDir)\thirdparty\openvr\bin\win32\*.dll" "$(OutDir)" + @@ -92,9 +104,10 @@ %(AdditionalDependencies) - copy /Y "$(SolutionDir)\thirdparty\sdl2_ttf-2.0.14\lib\x86\*.dll" "$(OutDir)" -copy /Y "$(SolutionDir)\thirdparty\sdl2-2.0.3\bin\win32\*.dll" "$(OutDir)" -copy /Y "$(SolutionDir)\thirdparty\openvr\bin\win32\*.dll" "$(OutDir)" + + copy /Y "$(SolutionDir)\thirdparty\sdl2_ttf-2.0.14\lib\x86\*.dll" "$(OutDir)" + copy /Y "$(SolutionDir)\thirdparty\sdl2-2.0.3\bin\win32\*.dll" "$(OutDir)" + copy /Y "$(SolutionDir)\thirdparty\openvr\bin\win32\*.dll" "$(OutDir)" diff --git a/openvrsimplexamples/src/main.cpp b/openvrsimplexamples/src/main.cpp index 1f40db5..13a9592 100644 --- a/openvrsimplexamples/src/main.cpp +++ b/openvrsimplexamples/src/main.cpp @@ -224,7 +224,8 @@ int init_OpenVR() { cout << "There was a problem indentifying the base stations, please check they are powered on" << endl; - return -1; + //return -1; + // I'm not using base stations for now, so continue after error. } return 0;