Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions src/openvr_api_public.cpp
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 "vrcommon/pathtools_public.h"
#include "vrcommon/sharedlibtools_public.h"
#include "vrcommon/envvartools_public.h"
#include "hmderrors_public.h"
#include <vrcore/strtools_public.h>
#include <vrcore/vrpathregistry_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
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
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
6 changes: 3 additions & 3 deletions src/vrcommon/pathtools_public.cpp
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 Expand Up @@ -66,7 +66,7 @@ std::string Path_GetExecutablePath()
return "";
}
#else
AssertMsg( false, "Implement Plat_GetExecutablePath" );
//AssertMsg( false, "Implement Plat_GetExecutablePath" );
return "";
#endif

Expand Down
2 changes: 1 addition & 1 deletion src/vrcommon/sharedlibtools_public.cpp
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
8 changes: 4 additions & 4 deletions src/vrcommon/strtools_public.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//========= Copyright Valve Corporation ============//
#include <vrcore/strtools_public.h>
#include "vrcommon/strtools_public.h"
//#include "vrcommon/assert.h"
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
Expand All @@ -9,7 +10,6 @@
#include <functional>
#include <locale>
#include <codecvt>
#include <vrcore/assert.h>

#if defined( _WIN32 )
#include <windows.h>
Expand Down Expand Up @@ -128,7 +128,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,7 +149,7 @@ 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 "";
}

Expand Down
12 changes: 6 additions & 6 deletions src/vrcommon/vrpathregistry_public.cpp
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
//========= Copyright Valve Corporation ============//

#include <vrcore/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/vrpathregistry_public.h"
#include "json/json.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