diff --git a/.gitignore b/.gitignore index 9e8ea83..32fc6bd 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,10 @@ _deps *.vpc *.vpc.sentinel *.vpc_crc + +# Parts from builds +*.recipe +*.lastbuildstate +*.exp +*.ilk +build*/ diff --git a/CMakeLists.txt b/CMakeLists.txt index fd464fe..703c469 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,23 +1,26 @@ +# Copyright (c) 2020, Valve Software +# +# SPDX-License-Identifier: BSD-3-Clause + cmake_minimum_required(VERSION 3.10) set(CMAKE_SUPPRESS_REGENERATION true) project(unity_xr_openvr_plugin) -# C++ 17 - note cmake minver is 3.10 supported only on MS C++ 2015 Update 3 and above +# C++ 17 - note cmake minver is 3.10 supported only on MS C++ 2015 Update 3 and +# above message(STATUS "Project language set to C++17") set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED True) -set(BINARY_RUNTIME_PATH "${CMAKE_SOURCE_DIR}/com.valve.openvr/Runtime") -# Determine platform architecture -message(STATUS "Checking platform architecture...") +set(PACKAGE "com.valve.openvr") # Auto determine platform if none is provided if(NOT PLATFORM) if(CMAKE_SIZEOF_VOID_P MATCHES 8) - set(PLATFORM 64) + set(PLATFORM 64) else() - set(PLATFORM 32) + set(PLATFORM 32) endif() endif() @@ -25,49 +28,39 @@ endif() if(PLATFORM MATCHES 64) set(PLATFORMX "x64") else() - set(PLATFORMX "x86") + set(PLATFORMX "x86") endif() -set(BINARY_PATH "${CMAKE_SOURCE_DIR}/com.valve.openvr/Runtime/${PLATFORMX}") -message(STATUS "Platform binary path set to: ${BINARY_PATH}") +option( + COPY_TO_PACKAGE + "Should the binaries be copied to the ${PACKAGE} package as a post-build step? This will modify the source tree!" + ON) + +set(DEST "${CMAKE_CURRENT_SOURCE_DIR}/${PACKAGE}/Runtime/${PLATFORMX}") # Set Platform if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") - add_definitions(-DLINUX -DPOSIX) - set(OPENVR_API_NAME "libopenvr_api") - set(COMPILED_LIB_TYPE "so") - set(IMPORT_LIB_TYPE "so.dbg") - set(ARCH_TARGET linux64) - set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-rpath -Wl,'$ORIGIN'") - set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) - - if(${PLATFORM} MATCHES 32) - message(WARNING "OpenVR x86 binaries not provided on x86 GNU/Linux.") - endif() + add_definitions(-DLINUX -DPOSIX) + set(CMAKE_SHARED_LINKER_FLAGS + "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-rpath -Wl,'$ORIGIN'") + set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) -elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows") - if(${MSVC_VERSION} VERSION_LESS 1919) - set(PDBFILE "vc141.pdb") - else() - set(PDBFILE "vc142.pdb") + if(${PLATFORM} MATCHES 32) + message(WARNING "OpenVR x86 binaries not provided on x86 GNU/Linux.") endif() +elseif(${CMAKE_SYSTEM_NAME} MATCHES "Windows") add_definitions(-D_WIN32) add_compile_options("/Zi") - set(OPENVR_API_NAME "openvr_api") - set(COMPILED_LIB_TYPE "dll") - set(IMPORT_LIB_TYPE "lib") - set(ARCH_TARGET win${PLATFORM}) - set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS True) endif() if(MSVC) - message(WARNING "Adding static link option.") - add_compile_options( - $<$:/MT> #---------| - $<$:/MTd> #---|-- Statically link the runtime libraries - $<$:/MT> #--| - ) + # Statically link the runtime libraries + add_compile_options( + $<$:/MT> + $<$:/MTd> + $<$:/MT> + $<$:/MT>) endif() message(STATUS "Compilation set for ${CMAKE_SYSTEM_NAME} ${PLATFORM}bit") @@ -76,107 +69,110 @@ message(STATUS "Compilation set for ${CMAKE_SYSTEM_NAME} ${PLATFORM}bit") message(STATUS "Adding XRSDKOpenVR...") add_library(XRSDKOpenVR SHARED - ${CMAKE_SOURCE_DIR}/Providers/dllmain.cpp - ${CMAKE_SOURCE_DIR}/Providers/OpenVRProviderContext.h - ${CMAKE_SOURCE_DIR}/Providers/OpenVRSystem.h ${CMAKE_SOURCE_DIR}/Providers/OpenVRSystem.cpp - ${CMAKE_SOURCE_DIR}/Providers/UserProjectSettings.h ${CMAKE_SOURCE_DIR}/Providers/UserProjectSettings.cpp - - ${CMAKE_SOURCE_DIR}/Providers/Display/Display.h ${CMAKE_SOURCE_DIR}/Providers/Display/Display.cpp - ${CMAKE_SOURCE_DIR}/Providers/Input/Input.h ${CMAKE_SOURCE_DIR}/Providers/Input/Input.cpp - - ${CMAKE_SOURCE_DIR}/CommonHeaders/UnityInterfaces.h ${CMAKE_SOURCE_DIR}/CommonHeaders/UnityInterfaces.cpp - - ${CMAKE_SOURCE_DIR}/CommonHeaders/Singleton.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/CommonTypes.h - - ${CMAKE_SOURCE_DIR}/CommonHeaders/OpenVR/openvr.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/OpenVR/openvr_driver.h - - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/IUnityXRAudio.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/IUnityEventQueue.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/IUnityGraphics.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/IUnityGraphicsD3D11.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/IUnityGraphicsD3D12.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/IUnityGraphicsMetal.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/IUnityGraphicsVulkan.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/IUnityInterface.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/IUnityProfilerCallbacks.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/IUnityRenderingExtensions.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/IUnityShaderCompilerAccess.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/IUnityXRDisplay.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/IUnityXRDisplayShadingRateExt.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/IUnityXRInput.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/IUnityXRMeshing.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/IUnityXRPreInit.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/IUnityXRStats.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/IUnityXRTrace.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/UnitySubsystemTypes.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/UnityXRDisplayStats.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/UnityXRTypes.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/UnityTypes.h - ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/XRMath.h ${CMAKE_SOURCE_DIR}/CommonHeaders/ProviderInterface/XRMath.cpp + Providers/dllmain.cpp + Providers/OpenVRProviderContext.h + Providers/OpenVRSystem.h Providers/OpenVRSystem.cpp + Providers/UserProjectSettings.h Providers/UserProjectSettings.cpp + + Providers/Display/Display.h Providers/Display/Display.cpp + Providers/Input/Input.h Providers/Input/Input.cpp + + CommonHeaders/UnityInterfaces.h CommonHeaders/UnityInterfaces.cpp + + CommonHeaders/Singleton.h + CommonHeaders/CommonTypes.h + + CommonHeaders/OpenVR/openvr.h + CommonHeaders/OpenVR/openvr_driver.h + + CommonHeaders/ProviderInterface/IUnityXRAudio.h + CommonHeaders/ProviderInterface/IUnityEventQueue.h + CommonHeaders/ProviderInterface/IUnityGraphics.h + CommonHeaders/ProviderInterface/IUnityGraphicsD3D11.h + CommonHeaders/ProviderInterface/IUnityGraphicsD3D12.h + CommonHeaders/ProviderInterface/IUnityGraphicsMetal.h + CommonHeaders/ProviderInterface/IUnityGraphicsVulkan.h + CommonHeaders/ProviderInterface/IUnityInterface.h + CommonHeaders/ProviderInterface/IUnityProfilerCallbacks.h + CommonHeaders/ProviderInterface/IUnityRenderingExtensions.h + CommonHeaders/ProviderInterface/IUnityShaderCompilerAccess.h + CommonHeaders/ProviderInterface/IUnityXRDisplay.h + CommonHeaders/ProviderInterface/IUnityXRDisplayShadingRateExt.h + CommonHeaders/ProviderInterface/IUnityXRInput.h + CommonHeaders/ProviderInterface/IUnityXRMeshing.h + CommonHeaders/ProviderInterface/IUnityXRPreInit.h + CommonHeaders/ProviderInterface/IUnityXRStats.h + CommonHeaders/ProviderInterface/IUnityXRTrace.h + CommonHeaders/ProviderInterface/UnitySubsystemTypes.h + CommonHeaders/ProviderInterface/UnityXRDisplayStats.h + CommonHeaders/ProviderInterface/UnityXRTypes.h + CommonHeaders/ProviderInterface/UnityTypes.h + CommonHeaders/ProviderInterface/XRMath.h CommonHeaders/ProviderInterface/XRMath.cpp ) -target_include_directories(XRSDKOpenVR PUBLIC - ${CMAKE_SOURCE_DIR}/Providers - ${CMAKE_SOURCE_DIR}/CommonHeaders - ${CMAKE_SOURCE_DIR}/ThirdParty +target_include_directories(XRSDKOpenVR PUBLIC + Providers + CommonHeaders + ThirdParty ) -include(GenerateExportHeader) -generate_export_header(XRSDKOpenVR) - - -message(STATUS "Runtime output directory set to: ${BINARY_PATH}") -set_target_properties(XRSDKOpenVR - PROPERTIES - LIBRARY_OUTPUT_DIRECTORY "${BINARY_PATH}" - ARCHIVE_OUTPUT_DIRECTORY_DEBUG "${BINARY_PATH}" - LIBRARY_OUTPUT_DIRECTORY_DEBUG "${BINARY_PATH}" - RUNTIME_OUTPUT_DIRECTORY_DEBUG "${BINARY_PATH}" - ARCHIVE_OUTPUT_DIRECTORY_RELEASE "${BINARY_PATH}" - LIBRARY_OUTPUT_DIRECTORY_RELEASE "${BINARY_PATH}" - RUNTIME_OUTPUT_DIRECTORY_RELEASE "${BINARY_PATH}" -) - - # OpenVR -message(STATUS "Importing OpenVR API...") - -add_library(openvr_api SHARED IMPORTED) -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}) +set(OPENVR_DIR ${CMAKE_CURRENT_SOURCE_DIR}/lib/${PLATFORMX}) +add_library(openvr_api SHARED IMPORTED) +set_target_properties( + openvr_api + PROPERTIES + IMPORTED_LOCATION + ${OPENVR_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}openvr_api${CMAKE_SHARED_LIBRARY_SUFFIX} +) +if(WIN32) + set_target_properties( + openvr_api + PROPERTIES + IMPORTED_IMPLIB + ${OPENVR_DIR}/${CMAKE_IMPORT_LIBRARY_PREFIX}openvr_api${CMAKE_IMPORT_LIBRARY_SUFFIX} + ) +endif() set_target_properties(openvr_api PROPERTIES LINKER_LANGUAGE CXX) target_link_libraries(XRSDKOpenVR PUBLIC openvr_api) -if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") - # 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}/${OPENVR_API_NAME}.${COMPILED_LIB_TYPE} - - COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_SOURCE_DIR}/lib/${PLATFORMX}/${OPENVR_API_NAME}.${COMPILED_LIB_TYPE}.sig - ${BINARY_PATH}/${OPENVR_API_NAME}.${COMPILED_LIB_TYPE}.sig - - COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_SOURCE_DIR}/lib/${PLATFORMX}/${OPENVR_API_NAME}.${IMPORT_LIB_TYPE} - ${BINARY_PATH}/${OPENVR_API_NAME}.${IMPORT_LIB_TYPE} - - COMMAND ${CMAKE_COMMAND} -E copy - ${CMAKE_SOURCE_DIR}/XRSDKOPENVR.dir/Release/${PDBFILE} - ${BINARY_PATH}/${PDBFILE} - ) -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} - - 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} - ) +if(COPY_TO_PACKAGE) + message( + STATUS + "Will copy result binary (and OpenVR dependency) to ${DEST} as a post-build step: Turn off COPY_TO_PACKAGE to disable this behavior." + ) + + if(WIN32) + # Post-Build - Copy OpenVR api + add_custom_command( + TARGET XRSDKOpenVR + POST_BUILD + COMMAND + ${CMAKE_COMMAND} -E copy + ${OPENVR_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}openvr_api${CMAKE_SHARED_LIBRARY_SUFFIX} + ${DEST} + COMMAND + ${CMAKE_COMMAND} -E copy + ${OPENVR_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}openvr_api${CMAKE_SHARED_LIBRARY_SUFFIX}.sig + ${DEST} + COMMAND ${CMAKE_COMMAND} -E rm -f ${DEST}/$ + COMMAND ${CMAKE_COMMAND} -E rm -f ${DEST}/$ + COMMAND ${CMAKE_COMMAND} -E copy "$" ${DEST} + COMMAND ${CMAKE_COMMAND} -E copy "$" ${DEST} + COMMENT "Copying plugin binary to package runtime directory" + VERBATIM) + else() + # Post-Build - Copy OpenVR api + add_custom_command( + TARGET XRSDKOpenVR + POST_BUILD + COMMAND + ${CMAKE_COMMAND} -E copy + ${OPENVR_DIR}/${CMAKE_SHARED_LIBRARY_PREFIX}openvr_api${CMAKE_SHARED_LIBRARY_SUFFIX} + ${DEST} + COMMAND ${CMAKE_COMMAND} -E rm -f "${DEST}/$" + COMMAND ${CMAKE_COMMAND} -E copy "$" ${DEST} + COMMENT "Copying plugin binary to package runtime directory" + VERBATIM) + endif() endif() diff --git a/com.valve.openvr/Editor/OpenVRBuildProcessor.cs b/com.valve.openvr/Editor/OpenVRBuildProcessor.cs index 3002842..cfb340e 100644 --- a/com.valve.openvr/Editor/OpenVRBuildProcessor.cs +++ b/com.valve.openvr/Editor/OpenVRBuildProcessor.cs @@ -19,7 +19,6 @@ public class OpenVRBuildProcessor : IPreprocessBuildWithReport { "XRSDKOpenVR", "openvr_api", - "vc14", }; public int callbackOrder { get; set; } @@ -28,8 +27,8 @@ public bool ShouldIncludeRuntimePluginsInBuild(string path) { XRGeneralSettings generalSettings = XRGeneralSettingsPerBuildTarget.XRGeneralSettingsForBuildTarget(BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget)); if (generalSettings == null) - return false; - + return false; + foreach (var loader in generalSettings.Manager.loaders) { if (loader is OpenVRLoader) @@ -58,4 +57,4 @@ public void OnPreprocessBuild(BuildReport report) } } } -#endif \ No newline at end of file +#endif diff --git a/com.valve.openvr/Runtime/x64/XRSDKOpenVR.dll b/com.valve.openvr/Runtime/x64/XRSDKOpenVR.dll index 22f4c89..3b69e20 100644 Binary files a/com.valve.openvr/Runtime/x64/XRSDKOpenVR.dll and b/com.valve.openvr/Runtime/x64/XRSDKOpenVR.dll differ diff --git a/com.valve.openvr/Runtime/x64/XRSDKOpenVR.dll.meta b/com.valve.openvr/Runtime/x64/XRSDKOpenVR.dll.meta index f68d421..25a9671 100644 --- a/com.valve.openvr/Runtime/x64/XRSDKOpenVR.dll.meta +++ b/com.valve.openvr/Runtime/x64/XRSDKOpenVR.dll.meta @@ -33,7 +33,7 @@ PluginImporter: settings: CPU: x86_64 DefaultValueInitialized: true - OS: AnyOS + OS: Windows - first: Standalone: Linux64 second: diff --git a/com.valve.openvr/Runtime/x64/XRSDKOpenVR.pdb b/com.valve.openvr/Runtime/x64/XRSDKOpenVR.pdb new file mode 100644 index 0000000..77c6995 Binary files /dev/null and b/com.valve.openvr/Runtime/x64/XRSDKOpenVR.pdb differ diff --git a/com.valve.openvr/Runtime/x64/vc142.pdb.meta b/com.valve.openvr/Runtime/x64/XRSDKOpenVR.pdb.meta similarity index 74% rename from com.valve.openvr/Runtime/x64/vc142.pdb.meta rename to com.valve.openvr/Runtime/x64/XRSDKOpenVR.pdb.meta index 79afcfa..bd12a8a 100644 --- a/com.valve.openvr/Runtime/x64/vc142.pdb.meta +++ b/com.valve.openvr/Runtime/x64/XRSDKOpenVR.pdb.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 48666f9e5c758b2459cb91f4d6092dec +guid: d7444decf8a505d4dbe1f1ad1bd04090 DefaultImporter: externalObjects: {} userData: diff --git a/com.valve.openvr/Runtime/x64/lib.meta b/com.valve.openvr/Runtime/x64/lib.meta deleted file mode 100644 index fecea72..0000000 --- a/com.valve.openvr/Runtime/x64/lib.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9dc49653f3d93c07186a2fb58fbf5fe7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.valve.openvr/Runtime/x64/lib/x64.meta b/com.valve.openvr/Runtime/x64/lib/x64.meta deleted file mode 100644 index 11f3d16..0000000 --- a/com.valve.openvr/Runtime/x64/lib/x64.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b7f7581011033cd66855bc3ac3050327 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.valve.openvr/Runtime/x64/lib/x64/libopenvr_api.so b/com.valve.openvr/Runtime/x64/lib/x64/libopenvr_api.so deleted file mode 100644 index 8daaeb3..0000000 Binary files a/com.valve.openvr/Runtime/x64/lib/x64/libopenvr_api.so and /dev/null differ diff --git a/com.valve.openvr/Runtime/x64/lib/x64/libopenvr_api.so.dbg b/com.valve.openvr/Runtime/x64/lib/x64/libopenvr_api.so.dbg deleted file mode 100644 index 76929bc..0000000 Binary files a/com.valve.openvr/Runtime/x64/lib/x64/libopenvr_api.so.dbg and /dev/null differ 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 deleted file mode 100644 index 6759de4..0000000 --- a/com.valve.openvr/Runtime/x64/lib/x64/libopenvr_api.so.dbg.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ff189a956ae05fee2bd75005ef235961 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: 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 deleted file mode 100644 index 212fdb3..0000000 --- a/com.valve.openvr/Runtime/x64/lib/x64/libopenvr_api.so.meta +++ /dev/null @@ -1,27 +0,0 @@ -fileFormatVersion: 2 -guid: 6a784685307735c2aa07dc5df5b6c852 -PluginImporter: - externalObjects: {} - serializedVersion: 2 - iconMap: {} - executionOrder: {} - defineConstraints: [] - isPreloaded: 0 - isOverridable: 1 - isExplicitlyReferenced: 0 - validateReferences: 1 - platformData: - - first: - Any: - second: - enabled: 1 - settings: {} - - first: - Editor: Editor - second: - enabled: 0 - settings: - DefaultValueInitialized: true - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.valve.openvr/Runtime/x64/libXRSDKOpenVR.so.meta b/com.valve.openvr/Runtime/x64/libXRSDKOpenVR.so.meta index 7ef6edf..3fcdfbb 100644 --- a/com.valve.openvr/Runtime/x64/libXRSDKOpenVR.so.meta +++ b/com.valve.openvr/Runtime/x64/libXRSDKOpenVR.so.meta @@ -11,6 +11,16 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 0 + Exclude Linux64: 0 + Exclude OSXUniversal: 1 + Exclude Win: 0 + Exclude Win64: 0 - first: Any: second: @@ -19,9 +29,35 @@ PluginImporter: - first: Editor: Editor second: - enabled: 0 + enabled: 1 settings: + CPU: x86_64 DefaultValueInitialized: true + OS: Linux + - first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: x86_64 + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 1 + settings: + CPU: x86 + - first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: x86_64 userData: assetBundleName: assetBundleVariant: diff --git a/com.valve.openvr/Runtime/x64/libopenvr_api.so.meta b/com.valve.openvr/Runtime/x64/libopenvr_api.so.meta index d31c6d1..5f431a3 100644 --- a/com.valve.openvr/Runtime/x64/libopenvr_api.so.meta +++ b/com.valve.openvr/Runtime/x64/libopenvr_api.so.meta @@ -11,6 +11,16 @@ PluginImporter: isExplicitlyReferenced: 0 validateReferences: 1 platformData: + - first: + : Any + second: + enabled: 0 + settings: + Exclude Editor: 0 + Exclude Linux64: 0 + Exclude OSXUniversal: 1 + Exclude Win: 0 + Exclude Win64: 0 - first: Any: second: @@ -19,9 +29,35 @@ PluginImporter: - first: Editor: Editor second: - enabled: 0 + enabled: 1 settings: + CPU: x86_64 DefaultValueInitialized: true + OS: Linux + - first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: x86_64 + - first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: None + - first: + Standalone: Win + second: + enabled: 1 + settings: + CPU: x86 + - first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: x86_64 userData: assetBundleName: assetBundleVariant: diff --git a/com.valve.openvr/Runtime/x64/openvr_api.dll.meta b/com.valve.openvr/Runtime/x64/openvr_api.dll.meta index 3884a99..7a5cce5 100644 --- a/com.valve.openvr/Runtime/x64/openvr_api.dll.meta +++ b/com.valve.openvr/Runtime/x64/openvr_api.dll.meta @@ -33,13 +33,13 @@ PluginImporter: settings: CPU: x86_64 DefaultValueInitialized: true - OS: AnyOS + OS: Windows - first: Standalone: Linux64 second: enabled: 1 settings: - CPU: AnyCPU + CPU: x86_64 - first: Standalone: OSXUniversal second: diff --git a/com.valve.openvr/Runtime/x64/ucrtbased.dll.meta b/com.valve.openvr/Runtime/x64/ucrtbased.dll.meta index 39314e3..b814466 100644 --- a/com.valve.openvr/Runtime/x64/ucrtbased.dll.meta +++ b/com.valve.openvr/Runtime/x64/ucrtbased.dll.meta @@ -31,15 +31,15 @@ PluginImporter: second: enabled: 1 settings: - CPU: AnyCPU + CPU: x86_64 DefaultValueInitialized: true - OS: AnyOS + OS: Windows - first: Standalone: Linux64 second: enabled: 1 settings: - CPU: x86_64 + CPU: AnyCPU - first: Standalone: OSXUniversal second: diff --git a/com.valve.openvr/Runtime/x64/vc141.pdb b/com.valve.openvr/Runtime/x64/vc141.pdb deleted file mode 100644 index fc9ae18..0000000 Binary files a/com.valve.openvr/Runtime/x64/vc141.pdb and /dev/null differ diff --git a/com.valve.openvr/Runtime/x64/vc141.pdb.meta b/com.valve.openvr/Runtime/x64/vc141.pdb.meta deleted file mode 100644 index 50d8375..0000000 --- a/com.valve.openvr/Runtime/x64/vc141.pdb.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 01d1a3397d285ac46b0d6386be03f3c9 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.valve.openvr/Runtime/x64/vc142.pdb b/com.valve.openvr/Runtime/x64/vc142.pdb deleted file mode 100644 index 8b69ae4..0000000 Binary files a/com.valve.openvr/Runtime/x64/vc142.pdb and /dev/null differ diff --git a/com.valve.openvr/Runtime/x86/XRSDKOpenVR.dll b/com.valve.openvr/Runtime/x86/XRSDKOpenVR.dll index f7c9dab..1f15cd4 100644 Binary files a/com.valve.openvr/Runtime/x86/XRSDKOpenVR.dll and b/com.valve.openvr/Runtime/x86/XRSDKOpenVR.dll differ diff --git a/com.valve.openvr/Runtime/x86/XRSDKOpenVR.dll.meta b/com.valve.openvr/Runtime/x86/XRSDKOpenVR.dll.meta index 03b32ba..a365b7b 100644 --- a/com.valve.openvr/Runtime/x86/XRSDKOpenVR.dll.meta +++ b/com.valve.openvr/Runtime/x86/XRSDKOpenVR.dll.meta @@ -33,7 +33,7 @@ PluginImporter: settings: CPU: x86 DefaultValueInitialized: true - OS: AnyOS + OS: Windows - first: Standalone: Linux64 second: diff --git a/com.valve.openvr/Runtime/x86/XRSDKOpenVR.pdb b/com.valve.openvr/Runtime/x86/XRSDKOpenVR.pdb index 3ab3662..f673463 100644 Binary files a/com.valve.openvr/Runtime/x86/XRSDKOpenVR.pdb and b/com.valve.openvr/Runtime/x86/XRSDKOpenVR.pdb differ diff --git a/com.valve.openvr/Runtime/x86/openvr_api.dll.meta b/com.valve.openvr/Runtime/x86/openvr_api.dll.meta index 4d0a1a8..c0ce3f6 100644 --- a/com.valve.openvr/Runtime/x86/openvr_api.dll.meta +++ b/com.valve.openvr/Runtime/x86/openvr_api.dll.meta @@ -33,13 +33,13 @@ PluginImporter: settings: CPU: x86 DefaultValueInitialized: true - OS: AnyOS + OS: Windows - first: Standalone: Linux64 second: enabled: 1 settings: - CPU: AnyCPU + CPU: x86_64 - first: Standalone: OSXUniversal second: diff --git a/com.valve.openvr/Runtime/x86/ucrtbased.dll.meta b/com.valve.openvr/Runtime/x86/ucrtbased.dll.meta index 3247a0f..64eeac7 100644 --- a/com.valve.openvr/Runtime/x86/ucrtbased.dll.meta +++ b/com.valve.openvr/Runtime/x86/ucrtbased.dll.meta @@ -31,15 +31,15 @@ PluginImporter: second: enabled: 1 settings: - CPU: AnyCPU + CPU: x86 DefaultValueInitialized: true - OS: AnyOS + OS: Windows - first: Standalone: Linux64 second: enabled: 1 settings: - CPU: x86_64 + CPU: AnyCPU - first: Standalone: OSXUniversal second: diff --git a/com.valve.openvr/Runtime/x86/vc141.pdb b/com.valve.openvr/Runtime/x86/vc141.pdb deleted file mode 100644 index dd9a94d..0000000 Binary files a/com.valve.openvr/Runtime/x86/vc141.pdb and /dev/null differ diff --git a/com.valve.openvr/Runtime/x86/vc141.pdb.meta b/com.valve.openvr/Runtime/x86/vc141.pdb.meta deleted file mode 100644 index 4b5eade..0000000 --- a/com.valve.openvr/Runtime/x86/vc141.pdb.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c021bc044f6f8d14bbedf463c46d94c1 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/com.valve.openvr/Runtime/x86/vc142.pdb b/com.valve.openvr/Runtime/x86/vc142.pdb deleted file mode 100644 index a530ace..0000000 Binary files a/com.valve.openvr/Runtime/x86/vc142.pdb and /dev/null differ diff --git a/com.valve.openvr/Runtime/x86/vc142.pdb.meta b/com.valve.openvr/Runtime/x86/vc142.pdb.meta deleted file mode 100644 index 00ac8c1..0000000 --- a/com.valve.openvr/Runtime/x86/vc142.pdb.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 740c3aa8431d0334e80299de98723996 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: