Skip to content
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

Fixed include problems and compilation errors #1558

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed include problems and compilation errors #1558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/openvr_api_public.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
#define VR_API_EXPORT 1
#include "openvr.h"
#include "ivrclientcore.h"
#include <vrcore/pathtools_public.h>
#include <vrcore/sharedlibtools_public.h>
#include <vrcore/envvartools_public.h>
#include "hmderrors_public.h"
#include <vrcore/strtools_public.h>
#include <vrcore/vrpathregistry_public.h>
#include <vrcommon/pathtools_public.h>
#include <vrcommon/sharedlibtools_public.h>
#include <vrcommon/envvartools_public.h>
#include <vrcommon/hmderrors_public.h>
#include <vrcommon/strtools_public.h>
#include <vrcommon/vrpathregistry_public.h>
#include <mutex>

using vr::EVRInitError;
Expand Down
6 changes: 3 additions & 3 deletions src/vrcommon/dirtools_public.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
//========= Copyright Valve Corporation ============//
#include <vrcore/dirtools_public.h>
#include <vrcore/strtools_public.h>
#include <vrcore/pathtools_public.h>
#include <vrcommon/dirtools_public.h>
#include <vrcommon/strtools_public.h>
#include <vrcommon/pathtools_public.h>

#include <errno.h>
#include <string.h>
Expand Down
4 changes: 2 additions & 2 deletions src/vrcommon/envvartools_public.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//========= Copyright Valve Corporation ============//
#include <vrcore/envvartools_public.h>
#include <vrcore/strtools_public.h>
#include <vrcommon/envvartools_public.h>
#include <vrcommon/strtools_public.h>
#include <stdlib.h>
#include <string>
#include <cctype>
Expand Down
4 changes: 2 additions & 2 deletions src/vrcommon/pathtools_public.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
//========= Copyright Valve Corporation ============//
#include <vrcore/strtools_public.h>
#include <vrcore/pathtools_public.h>
#include <vrcommon/strtools_public.h>
#include <vrcommon/pathtools_public.h>

#if defined( _WIN32)
#include <windows.h>
Expand Down
2 changes: 1 addition & 1 deletion src/vrcommon/sharedlibtools_public.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//========= Copyright Valve Corporation ============//
#include <vrcore/sharedlibtools_public.h>
#include <vrcommon/sharedlibtools_public.h>
#include <string.h>

#if defined(_WIN32)
Expand Down
11 changes: 6 additions & 5 deletions src/vrcommon/strtools_public.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//========= Copyright Valve Corporation ============//
#include <vrcore/strtools_public.h>
#include <vrcommon/strtools_public.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
Expand All @@ -9,7 +9,7 @@
#include <functional>
#include <locale>
#include <codecvt>
#include <vrcore/assert.h>
//#include <assert.h>

#if defined( _WIN32 )
#include <windows.h>
Expand Down Expand Up @@ -111,6 +111,7 @@ std::wstring UTF8to16(const char * in)

std::wstring UTF8to16( const std::string & in ) { return UTF8to16( in.c_str() ); }

#if defined( _WIN32 )
//-----------------------------------------------------------------------------
// Purpose: Format string to std::string converter
//-----------------------------------------------------------------------------
Expand All @@ -128,7 +129,7 @@ std::string Format( const char *pchFormat, ... )
// Something went fairly wrong
if ( unSize < 0 )
{
AssertMsg( false, "Format string parse failure" );
//AssertMsg( false, "Format string parse failure" );
return "";
}

Expand All @@ -149,13 +150,13 @@ std::string Format( const char *pchFormat, ... )
// Double check, just in case
if ( unSize < 0 )
{
AssertMsg( false, "Format string parse failure" );
//AssertMsg( false, "Format string parse failure" );
return "";
}

return vecChar.data();
}

#endif



Expand Down
10 changes: 5 additions & 5 deletions src/vrcommon/vrpathregistry_public.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
//========= Copyright Valve Corporation ============//

#include <vrcore/vrpathregistry_public.h>
#include <vrcommon/vrpathregistry_public.h>
#include <json/json.h>
#include <vrcore/pathtools_public.h>
#include <vrcore/envvartools_public.h>
#include <vrcore/strtools_public.h>
#include <vrcore/dirtools_public.h>
#include <vrcommon/pathtools_public.h>
#include <vrcommon/envvartools_public.h>
#include <vrcommon/strtools_public.h>
#include <vrcommon/dirtools_public.h>

#if defined( WIN32 )
#include <windows.h>
Expand Down