Merge remote-tracking branch 'origin/master'

ValveSoftware · Jan 25, 2022 · f0a402f · f0a402f
2 parents 3aa1726 + acccb78
commit f0a402f
Show file tree

Hide file tree

Showing 18 changed files with 22 additions and 64 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -144,8 +144,14 @@ set_target_properties(XRSDKOpenVR
 message(STATUS "Importing OpenVR API...")
 
 add_library(openvr_api SHARED IMPORTED) 
+
+if(${CMAKE_SYSTEM_NAME} MATCHES "Windows")
 set_target_properties(openvr_api PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/lib/${PLATFORMX}/${OPENVR_API_NAME}.${COMPILED_LIB_TYPE})
 set_target_properties(openvr_api PROPERTIES IMPORTED_IMPLIB ${CMAKE_SOURCE_DIR}/lib/${PLATFORMX}/${OPENVR_API_NAME}.${IMPORT_LIB_TYPE})
+else()
+set_target_properties(openvr_api PROPERTIES IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/${OPENVR_API_NAME}.${COMPILED_LIB_TYPE})
+set_target_properties(openvr_api PROPERTIES IMPORTED_IMPLIB ${CMAKE_SOURCE_DIR}/${OPENVR_API_NAME}.${IMPORT_LIB_TYPE})
+endif()
 set_target_properties(openvr_api PROPERTIES LINKER_LANGUAGE CXX)
 target_link_libraries(XRSDKOpenVR PUBLIC openvr_api)
 
@@ -172,11 +178,11 @@ else()
 	# Post-Build - Copy OpenVR api
 	add_custom_command(TARGET XRSDKOpenVR POST_BUILD
 			COMMAND ${CMAKE_COMMAND} -E copy
-					${CMAKE_SOURCE_DIR}/lib/${PLATFORMX}/${OPENVR_API_NAME}.${COMPILED_LIB_TYPE}
-					${BINARY_PATH}/lib/${PLATFORMX}/${OPENVR_API_NAME}.${COMPILED_LIB_TYPE}
+					${CMAKE_SOURCE_DIR}/${OPENVR_API_NAME}.${COMPILED_LIB_TYPE}
+					${BINARY_PATH}/${OPENVR_API_NAME}.${COMPILED_LIB_TYPE}
 
 			COMMAND ${CMAKE_COMMAND} -E copy
-					${CMAKE_SOURCE_DIR}/lib/${PLATFORMX}/${OPENVR_API_NAME}.${IMPORT_LIB_TYPE}
-					${BINARY_PATH}/lib/${PLATFORMX}/${OPENVR_API_NAME}.${IMPORT_LIB_TYPE}
+					${CMAKE_SOURCE_DIR}/${OPENVR_API_NAME}.${IMPORT_LIB_TYPE}
+					${BINARY_PATH}/${OPENVR_API_NAME}.${IMPORT_LIB_TYPE}
 			)
 endif()
diff --git a/Providers/UserProjectSettings.cpp b/Providers/UserProjectSettings.cpp
@@ -197,8 +197,9 @@ std::string UserProjectSettings::GetProjectDirectoryPath( bool bAddDataDirectory
 		}
 		return projectDirectoryPath;
 		#else
-		projectDirectoryName = RemoveFileExtension( std::string( basename( fullExePath ) ) + "_Data/" );
-		return basePath + projectDirectoryName;
+		size_t lastindex = exePath.find_last_of("."); 
+		string projectPath = exePath.substr(0, lastindex); 
+		return projectPath + "_Data/";
 		#endif
 	}
 }

diff --git a/com.valve.openvr/Editor/OpenVRBuildProcessor.cs b/com.valve.openvr/Editor/OpenVRBuildProcessor.cs
@@ -58,4 +58,4 @@ public void OnPreprocessBuild(BuildReport report)
         }
     }
 }
-#endif
+#endif
diff --git a/com.valve.openvr/Runtime/Unity.XR.OpenVR.asmdef b/com.valve.openvr/Runtime/Unity.XR.OpenVR.asmdef
@@ -1,11 +1,13 @@
 {
     "name": "Unity.XR.OpenVR",
+    "rootNamespace": "",
     "references": [
         "Unity.XR.Management",
         "Unity.InputSystem"
     ],
     "includePlatforms": [
         "Editor",
+        "LinuxStandalone64",
         "WSA",
         "WindowsStandalone32",
         "WindowsStandalone64"

diff --git a/com.valve.openvr/Runtime/x64/XRSDKOpenVR.dll b/com.valve.openvr/Runtime/x64/XRSDKOpenVR.dll
diff --git a/com.valve.openvr/Runtime/x64/XRSDKOpenVR.dll.meta b/com.valve.openvr/Runtime/x64/XRSDKOpenVR.dll.meta
diff --git a/com.valve.openvr/Runtime/x64/lib.meta b/com.valve.openvr/Runtime/x64/lib.meta
diff --git a/com.valve.openvr/Runtime/x64/lib/x64.meta b/com.valve.openvr/Runtime/x64/lib/x64.meta
diff --git a/com.valve.openvr/Runtime/x64/lib/x64/libopenvr_api.so.dbg.meta b/com.valve.openvr/Runtime/x64/lib/x64/libopenvr_api.so.dbg.meta
diff --git a/com.valve.openvr/Runtime/x64/lib/x64/libopenvr_api.so.meta b/com.valve.openvr/Runtime/x64/lib/x64/libopenvr_api.so.meta
diff --git a/com.valve.openvr/Runtime/x64/libXRSDKOpenVR.so b/com.valve.openvr/Runtime/x64/libXRSDKOpenVR.so
diff --git a/com.valve.openvr/Runtime/x64/libXRSDKOpenVR.so.meta b/com.valve.openvr/Runtime/x64/libXRSDKOpenVR.so.meta
diff --git a/com.valve.openvr/Runtime/x64/openvr_api.dll.meta b/com.valve.openvr/Runtime/x64/openvr_api.dll.meta
diff --git a/com.valve.openvr/Runtime/x64/vc142.pdb b/com.valve.openvr/Runtime/x64/vc142.pdb
diff --git a/com.valve.openvr/Runtime/x86/XRSDKOpenVR.dll b/com.valve.openvr/Runtime/x86/XRSDKOpenVR.dll
diff --git a/com.valve.openvr/Runtime/x86/vc142.pdb b/com.valve.openvr/Runtime/x86/vc142.pdb
diff --git a/...envr/Runtime/x64/lib/x64/libopenvr_api.so → libopenvr_api.so b/...envr/Runtime/x64/lib/x64/libopenvr_api.so → libopenvr_api.so
diff --git a/.../Runtime/x64/lib/x64/libopenvr_api.so.dbg → libopenvr_api.so.dbg b/.../Runtime/x64/lib/x64/libopenvr_api.so.dbg → libopenvr_api.so.dbg
-Original file line number
+Diff line change
@@ Expand Up / @@ -58,4 +58,4 @@ public void OnPreprocessBuild(BuildReport report) @@
             }
         }
     }
-    #endif
+    #endif