Skip to content

Fixed successful build and run on Windows 10 VS2019 #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bitkojine wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Fixed successful build and run on Windows 10 VS2019 #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f659221
Update openvrsimplexamples.vcxproj
bitkojine Nov 23, 2020
48eb5e7
Update openvrsimplexamples.vcxproj
bitkojine Nov 23, 2020
0b136ff
Update openvrsimplexamples.vcxproj
bitkojine Nov 23, 2020
80a88ef
Added .vs/ folder to .gitignore
bitkojine Nov 23, 2020
221732c
Update .gitignore
bitkojine Nov 23, 2020
9b14e86
Update .gitignore
bitkojine Nov 24, 2020
4512faf
Update openvrsimplexamples.vcxproj
bitkojine Nov 24, 2020
bdb785c
Update openvrsimplexamples.vcxproj
bitkojine Nov 24, 2020
7cdc07c
Update .gitignore
bitkojine Nov 24, 2020
77cfafd
Update openvrsimplexamples.vcxproj
bitkojine Nov 24, 2020
2bbb091
Update main.cpp
bitkojine Nov 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@
obj
/*.sdf
bin

# Visual Studio generated
.vs
33 changes: 23 additions & 10 deletions openvrsimplexamples/openvrsimplexamples.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
Expand All @@ -21,18 +21,19 @@
<ProjectGuid>{AA7C3F03-1386-4856-8F6E-38672A296D42}</ProjectGuid>
<Keyword>Win32Proj</Keyword>
<RootNamespace>PruebasOpenVR</RootNamespace>
<WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v110</PlatformToolset>
<PlatformToolset>v142</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
</PropertyGroup>
Expand All @@ -50,13 +51,17 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<IncludePath>$(SolutionDir)\thirdparty\sdl2_ttf-2.0.14\include;$(SolutionDir)\thirdparty\sdl2-2.0.3\include;$(SolutionDir)\thirdparty\openvr\headers;$(ProjectDir)include;$(IncludePath)</IncludePath>
<OutDir>bin\$(Configuration)</OutDir>
<IntDir>obj\$(Configuration)</IntDir>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<OutDir>bin/$(Configuration)/</OutDir>
<IntDir>obj/$(Configuration)/</IntDir>
<ReferencePath>$(VCInstallDir)atlmfc\lib;$(VCInstallDir)lib</ReferencePath>
<LibraryPath>$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSDK_LibraryPath_x86);</LibraryPath>
<OutDir>bin\$(Configuration)</OutDir>
<IntDir>obj\$(Configuration)</IntDir>
<ReferencePath>$(VC_ReferencesPath_x86);</ReferencePath>
<LibraryPath>$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86)</LibraryPath>
<IncludePath>$(SolutionDir)\thirdparty\sdl2_ttf-2.0.14\include;$(SolutionDir)\thirdparty\sdl2-2.0.3\include;$(SolutionDir)\thirdparty\openvr\headers;$(ProjectDir)include;$(IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
Expand All @@ -69,7 +74,14 @@
<Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<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)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>
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)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
Expand All @@ -92,9 +104,10 @@
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<PostBuildEvent>
<Command>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)"</Command>
<Command>
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)"</Command>
</PostBuildEvent>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
Expand Down
3 changes: 2 additions & 1 deletion openvrsimplexamples/src/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down