From f659221deadbfcfb3b4496c23868496aca2ac158 Mon Sep 17 00:00:00 2001 From: RobeKey Date: Mon, 23 Nov 2020 16:45:38 +0200 Subject: [PATCH 01/11] Update openvrsimplexamples.vcxproj Added references to third party libs for Debug Win32 platform configuration. Build successful on VS2017. --- openvrsimplexamples/openvrsimplexamples.vcxproj | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/openvrsimplexamples/openvrsimplexamples.vcxproj b/openvrsimplexamples/openvrsimplexamples.vcxproj index fd33f33..bc332ed 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.16299.0 Application true - v110 + v141 Unicode Application false - v110 + v141 true Unicode @@ -50,6 +51,7 @@ true + $(MSBuildStartupDirectory)\thirdparty\sdl2_ttf-2.0.14\include;$(MSBuildStartupDirectory)\thirdparty\sdl2-2.0.3\include;$(MSBuildStartupDirectory)\thirdparty\openvr\headers;$(MSBuildProjectDirectory)\include;$(IncludePath) false @@ -69,6 +71,7 @@ Console true + $(MSBuildStartupDirectory)\thirdparty\openvr\lib\win32\openvr_api.lib;$(MSBuildStartupDirectory)\thirdparty\sdl2-2.0.3\bin\win32\SDL2.lib;$(MSBuildStartupDirectory)\thirdparty\sdl2-2.0.3\bin\win32\SDL2_static.lib;$(MSBuildStartupDirectory)\thirdparty\sdl2-2.0.3\bin\win32\SDL2main.lib;$(MSBuildStartupDirectory)\thirdparty\sdl2_ttf-2.0.14\lib\x86\SDL2_ttf.lib;%(AdditionalDependencies) From 48eb5e7ee9a186692893e07ae25b2681eb0eeda5 Mon Sep 17 00:00:00 2001 From: RobeKey Date: Mon, 23 Nov 2020 18:32:16 +0200 Subject: [PATCH 02/11] Update openvrsimplexamples.vcxproj Build successful on VS2019 "There is a long term bug to VS, please use ProjectDir rather than SolutionDir" --- openvrsimplexamples/openvrsimplexamples.vcxproj | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/openvrsimplexamples/openvrsimplexamples.vcxproj b/openvrsimplexamples/openvrsimplexamples.vcxproj index bc332ed..2d9465e 100644 --- a/openvrsimplexamples/openvrsimplexamples.vcxproj +++ b/openvrsimplexamples/openvrsimplexamples.vcxproj @@ -21,19 +21,19 @@ {AA7C3F03-1386-4856-8F6E-38672A296D42} Win32Proj PruebasOpenVR - 10.0.16299.0 + 10.0 Application true - v141 + v142 Unicode Application false - v141 + v142 true Unicode @@ -51,7 +51,7 @@ true - $(MSBuildStartupDirectory)\thirdparty\sdl2_ttf-2.0.14\include;$(MSBuildStartupDirectory)\thirdparty\sdl2-2.0.3\include;$(MSBuildStartupDirectory)\thirdparty\openvr\headers;$(MSBuildProjectDirectory)\include;$(IncludePath) + $(ProjectDir)..\thirdparty\sdl2_ttf-2.0.14\include;$(ProjectDir)..\thirdparty\sdl2-2.0.3\include;$(ProjectDir)..\thirdparty\openvr\headers;$(ProjectDir)include;$(IncludePath) false @@ -71,7 +71,7 @@ Console true - $(MSBuildStartupDirectory)\thirdparty\openvr\lib\win32\openvr_api.lib;$(MSBuildStartupDirectory)\thirdparty\sdl2-2.0.3\bin\win32\SDL2.lib;$(MSBuildStartupDirectory)\thirdparty\sdl2-2.0.3\bin\win32\SDL2_static.lib;$(MSBuildStartupDirectory)\thirdparty\sdl2-2.0.3\bin\win32\SDL2main.lib;$(MSBuildStartupDirectory)\thirdparty\sdl2_ttf-2.0.14\lib\x86\SDL2_ttf.lib;%(AdditionalDependencies) + $(ProjectDir)..\thirdparty\openvr\lib\win32\openvr_api.lib;$(ProjectDir)..\thirdparty\sdl2-2.0.3\bin\win32\SDL2.lib;$(ProjectDir)..\thirdparty\sdl2-2.0.3\bin\win32\SDL2_static.lib;$(ProjectDir)..\thirdparty\sdl2-2.0.3\bin\win32\SDL2main.lib;$(ProjectDir)..\thirdparty\sdl2_ttf-2.0.14\lib\x86\SDL2_ttf.lib;%(AdditionalDependencies) From 0b136ff1a06f631bbd77bb1648a77ead83c6b327 Mon Sep 17 00:00:00 2001 From: RobeKey Date: Mon, 23 Nov 2020 19:01:41 +0200 Subject: [PATCH 03/11] Update openvrsimplexamples.vcxproj Added .dll copy PostBuildEvent for Debug Win32. Changed $(SolutionDir) to $(ProjectDir). --- openvrsimplexamples/openvrsimplexamples.vcxproj | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/openvrsimplexamples/openvrsimplexamples.vcxproj b/openvrsimplexamples/openvrsimplexamples.vcxproj index 2d9465e..7090945 100644 --- a/openvrsimplexamples/openvrsimplexamples.vcxproj +++ b/openvrsimplexamples/openvrsimplexamples.vcxproj @@ -73,6 +73,11 @@ true $(ProjectDir)..\thirdparty\openvr\lib\win32\openvr_api.lib;$(ProjectDir)..\thirdparty\sdl2-2.0.3\bin\win32\SDL2.lib;$(ProjectDir)..\thirdparty\sdl2-2.0.3\bin\win32\SDL2_static.lib;$(ProjectDir)..\thirdparty\sdl2-2.0.3\bin\win32\SDL2main.lib;$(ProjectDir)..\thirdparty\sdl2_ttf-2.0.14\lib\x86\SDL2_ttf.lib;%(AdditionalDependencies) + + copy /Y "$(ProjectDir)..\thirdparty\sdl2_ttf-2.0.14\lib\x86\*.dll" "$(OutDir)" +copy /Y "$(ProjectDir)..\thirdparty\sdl2-2.0.3\bin\win32\*.dll" "$(OutDir)" +copy /Y "$(ProjectDir)..\thirdparty\openvr\bin\win32\*.dll" "$(OutDir)" + @@ -95,9 +100,9 @@ %(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 "$(ProjectDir)..\thirdparty\sdl2_ttf-2.0.14\lib\x86\*.dll" "$(OutDir)" +copy /Y "$(ProjectDir)..\thirdparty\sdl2-2.0.3\bin\win32\*.dll" "$(OutDir)" +copy /Y "$(ProjectDir)..\thirdparty\openvr\bin\win32\*.dll" "$(OutDir)" From 80a88ef8d9ac485b269e469fc3628cd36ecfe80d Mon Sep 17 00:00:00 2001 From: RobeKey Date: Mon, 23 Nov 2020 20:43:27 +0200 Subject: [PATCH 04/11] Added .vs/ folder to .gitignore --- .gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 6f824d8..8a500d2 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ obj /*.sdf bin + +.vs/ From 221732cc7b09b90950b3c312fbe16621455144ad Mon Sep 17 00:00:00 2001 From: RobeKey Date: Mon, 23 Nov 2020 20:55:29 +0200 Subject: [PATCH 05/11] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 8a500d2..14bf8c3 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ obj bin .vs/ +Debug/ From 9b14e861cba73fb811e8883313862db95a66190d Mon Sep 17 00:00:00 2001 From: RobeKey Date: Tue, 24 Nov 2020 06:09:16 +0200 Subject: [PATCH 06/11] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 14bf8c3..31029b8 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ bin .vs/ Debug/ +openvrsimplexamples/Release/ From 4512fafb0c1065ca57f2da042873a0585c5d72a7 Mon Sep 17 00:00:00 2001 From: RobeKey Date: Tue, 24 Nov 2020 06:23:55 +0200 Subject: [PATCH 07/11] Update openvrsimplexamples.vcxproj Unified VC++ Directories for Debug and Release builds. Release build now successful. --- openvrsimplexamples/openvrsimplexamples.vcxproj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openvrsimplexamples/openvrsimplexamples.vcxproj b/openvrsimplexamples/openvrsimplexamples.vcxproj index 7090945..b92e3ea 100644 --- a/openvrsimplexamples/openvrsimplexamples.vcxproj +++ b/openvrsimplexamples/openvrsimplexamples.vcxproj @@ -57,8 +57,9 @@ false bin/$(Configuration)/ obj/$(Configuration)/ - $(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib - $(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86); + $(VC_ReferencesPath_x86); + $(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86) + $(ProjectDir)..\thirdparty\sdl2_ttf-2.0.14\include;$(ProjectDir)..\thirdparty\sdl2-2.0.3\include;$(ProjectDir)..\thirdparty\openvr\headers;$(ProjectDir)include;$(IncludePath) From bdb785c9cfc26f44cbc66287cc1a378ca50af0b8 Mon Sep 17 00:00:00 2001 From: RobeKey Date: Tue, 24 Nov 2020 06:57:14 +0200 Subject: [PATCH 08/11] Update openvrsimplexamples.vcxproj --- openvrsimplexamples/openvrsimplexamples.vcxproj | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/openvrsimplexamples/openvrsimplexamples.vcxproj b/openvrsimplexamples/openvrsimplexamples.vcxproj index b92e3ea..74f790f 100644 --- a/openvrsimplexamples/openvrsimplexamples.vcxproj +++ b/openvrsimplexamples/openvrsimplexamples.vcxproj @@ -52,11 +52,13 @@ true $(ProjectDir)..\thirdparty\sdl2_ttf-2.0.14\include;$(ProjectDir)..\thirdparty\sdl2-2.0.3\include;$(ProjectDir)..\thirdparty\openvr\headers;$(ProjectDir)include;$(IncludePath) + bin\$(Configuration) + obj\$(Configuration) false - bin/$(Configuration)/ - obj/$(Configuration)/ + bin\$(Configuration) + obj\$(Configuration) $(VC_ReferencesPath_x86); $(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86) $(ProjectDir)..\thirdparty\sdl2_ttf-2.0.14\include;$(ProjectDir)..\thirdparty\sdl2-2.0.3\include;$(ProjectDir)..\thirdparty\openvr\headers;$(ProjectDir)include;$(IncludePath) From 7cdc07ca20a9ea71f916f0694d2a0c1ff46665dd Mon Sep 17 00:00:00 2001 From: RobeKey Date: Tue, 24 Nov 2020 07:06:52 +0200 Subject: [PATCH 09/11] Update .gitignore --- .gitignore | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 31029b8..86f82f7 100644 --- a/.gitignore +++ b/.gitignore @@ -28,6 +28,5 @@ obj /*.sdf bin -.vs/ -Debug/ -openvrsimplexamples/Release/ +# Visual Studio generated +.vs From 77cfafd9728baf755cfd44249297a86c1a072a25 Mon Sep 17 00:00:00 2001 From: RobeKey Date: Tue, 24 Nov 2020 07:15:57 +0200 Subject: [PATCH 10/11] Update openvrsimplexamples.vcxproj Changed $(ProjectDir) to $(SolutionDir). I've heard there's a bug with $(SolutionDir) in VS, but not sure what it is. --- .../openvrsimplexamples.vcxproj | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/openvrsimplexamples/openvrsimplexamples.vcxproj b/openvrsimplexamples/openvrsimplexamples.vcxproj index 74f790f..7596cb3 100644 --- a/openvrsimplexamples/openvrsimplexamples.vcxproj +++ b/openvrsimplexamples/openvrsimplexamples.vcxproj @@ -51,7 +51,7 @@ true - $(ProjectDir)..\thirdparty\sdl2_ttf-2.0.14\include;$(ProjectDir)..\thirdparty\sdl2-2.0.3\include;$(ProjectDir)..\thirdparty\openvr\headers;$(ProjectDir)include;$(IncludePath) + $(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) @@ -61,7 +61,7 @@ obj\$(Configuration) $(VC_ReferencesPath_x86); $(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86) - $(ProjectDir)..\thirdparty\sdl2_ttf-2.0.14\include;$(ProjectDir)..\thirdparty\sdl2-2.0.3\include;$(ProjectDir)..\thirdparty\openvr\headers;$(ProjectDir)include;$(IncludePath) + $(SolutionDir)\thirdparty\sdl2_ttf-2.0.14\include;$(SolutionDir)\thirdparty\sdl2-2.0.3\include;$(SolutionDir)\thirdparty\openvr\headers;$(ProjectDir)include;$(IncludePath) @@ -74,12 +74,13 @@ Console true - $(ProjectDir)..\thirdparty\openvr\lib\win32\openvr_api.lib;$(ProjectDir)..\thirdparty\sdl2-2.0.3\bin\win32\SDL2.lib;$(ProjectDir)..\thirdparty\sdl2-2.0.3\bin\win32\SDL2_static.lib;$(ProjectDir)..\thirdparty\sdl2-2.0.3\bin\win32\SDL2main.lib;$(ProjectDir)..\thirdparty\sdl2_ttf-2.0.14\lib\x86\SDL2_ttf.lib;%(AdditionalDependencies) + $(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 "$(ProjectDir)..\thirdparty\sdl2_ttf-2.0.14\lib\x86\*.dll" "$(OutDir)" -copy /Y "$(ProjectDir)..\thirdparty\sdl2-2.0.3\bin\win32\*.dll" "$(OutDir)" -copy /Y "$(ProjectDir)..\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)" @@ -103,9 +104,10 @@ copy /Y "$(ProjectDir)..\thirdparty\openvr\bin\win32\*.dll" "$(OutDir)"%(AdditionalDependencies) - copy /Y "$(ProjectDir)..\thirdparty\sdl2_ttf-2.0.14\lib\x86\*.dll" "$(OutDir)" -copy /Y "$(ProjectDir)..\thirdparty\sdl2-2.0.3\bin\win32\*.dll" "$(OutDir)" -copy /Y "$(ProjectDir)..\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)" From 2bbb091f4fff5e839578c291bd68c570d26aac84 Mon Sep 17 00:00:00 2001 From: RobeKey Date: Tue, 24 Nov 2020 13:07:12 +0200 Subject: [PATCH 11/11] Update main.cpp --- openvrsimplexamples/src/main.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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;