Linux

meruune · meruune · commit 80c8d15447c0 · 2025-09-30T02:49:40.000+09:00
diff --git a/.gitignore b/.gitignore
@@ -346,3 +346,7 @@ healthchecksdb
 MigrationBackup/
 
 out/
+
+.idea/
+
+.vscode/
diff --git a/.gitmodules b/.gitmodules
@@ -4,3 +4,6 @@
 [submodule "vendor/minhook"]
 	path = vendor/minhook
 	url = https://github.com/KimihikoAkayasaki/minhook
+[submodule "vendor/capnp"]
+	path = vendor/capnp
+	url = https://github.com/capnproto/capnproto
diff --git a/CMakePresets.json b/CMakePresets.json
@@ -41,28 +41,6 @@
         "USE_HOOKS": "ON"
       }
     },
-    {
-      "name": "x86-debug",
-      "displayName": "x86 Debug",
-      "inherits": "windows-base",
-      "architecture": {
-        "value": "x86",
-        "strategy": "external"
-      },
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug",
-        "USE_HOOKS": "ON"
-      }
-    },
-    {
-      "name": "x86-release",
-      "displayName": "x86 Release",
-      "inherits": "x86-debug",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release",
-        "USE_HOOKS": "ON"
-      }
-    },
     {
       "name": "x64-debug-nohooks",
       "displayName": "x64 Debug",
@@ -84,33 +62,14 @@
       }
     },
     {
-      "name": "x86-debug-nohooks",
-      "displayName": "x86 Debug",
-      "inherits": "windows-base",
-      "architecture": {
-        "value": "x86",
-        "strategy": "external"
-      },
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug"
-      }
-    },
-    {
-      "name": "x86-release-nohooks",
-      "displayName": "x86 Release",
-      "inherits": "x86-debug",
-      "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Release"
-      }
-    },
-    {
-      "name": "linux-debug",
-      "displayName": "Linux Debug",
+      "name": "linux-base",
+      "hidden": true,
       "generator": "Ninja",
       "binaryDir": "${sourceDir}/out/build/${presetName}",
       "installDir": "${sourceDir}/out/install/${presetName}",
       "cacheVariables": {
-        "CMAKE_BUILD_TYPE": "Debug"
+        "CMAKE_TOOLCHAIN_FILE": "/home/akaya/.vcpkg/scripts/buildsystems/vcpkg.cmake",
+        "VCPKG_TARGET_TRIPLET": "x64-linux"
       },
       "condition": {
         "type": "equals",
@@ -124,23 +83,23 @@
       }
     },
     {
-      "name": "macos-debug",
-      "displayName": "macOS Debug",
-      "generator": "Ninja",
-      "binaryDir": "${sourceDir}/out/build/${presetName}",
-      "installDir": "${sourceDir}/out/install/${presetName}",
+      "name": "linux-x64-debug",
+      "displayName": "Linux x64 Debug",
+      "inherits": "linux-base",
+      "architecture": {
+        "value": "x64",
+        "strategy": "external"
+      },
       "cacheVariables": {
         "CMAKE_BUILD_TYPE": "Debug"
-      },
-      "condition": {
-        "type": "equals",
-        "lhs": "${hostSystemName}",
-        "rhs": "Darwin"
-      },
-      "vendor": {
-        "microsoft.com/VisualStudioRemoteSettings/CMake/1.0": {
-          "sourceDir": "$env{HOME}/.vs/$ms{projectDirName}"
-        }
+      }
+    },
+    {
+      "name": "linux-x64-release",
+      "displayName": "Linux x64 Release",
+      "inherits": "linux-base",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
       }
     }
   ]
diff --git a/README.md b/README.md
@@ -41,4 +41,6 @@ and use them in Visual Studio (recommended) or straight from the DotNet CLI.
 The project templates already contain most of the needed documentation,  
 although please feel free to check out [the official wesite](https://docs.k2vr.tech/) for more docs sometime.
 
-The build and publishment workflow is the same as in this repo (excluding vendor deps).  
+The build and publishment workflow is the same as in this repo (excluding vendor deps).  
+
+capnp: autoreconf -i && ./configure && make -j6 check
diff --git a/driver_Amethyst/CMakeLists.txt b/driver_Amethyst/CMakeLists.txt
@@ -37,9 +37,8 @@ endif()
 add_library(${DRIVER_TARGET_NAME} SHARED ${driver_HDR} ${driver_SRC} ${driver_IDL})
 target_include_directories(${DRIVER_TARGET_NAME} PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include")
 
-if (CMAKE_VERSION VERSION_GREATER 3.12)
-  set_property(TARGET ${DRIVER_TARGET_NAME} PROPERTY CXX_STANDARD 20)
-endif()
+set_property(TARGET ${DRIVER_TARGET_NAME} PROPERTY CXX_STANDARD 20)
+set_property(TARGET ${DRIVER_TARGET_NAME} PROPERTY CXX_STANDARD_REQUIRED ON)
 
 # ----------------------- MinHook support ----------------------
 if (WIN32 AND USE_HOOKS)
@@ -69,11 +68,25 @@ elseif (DEFINED CAPNP_EXECUTABLE)
     set(CAPNP_COMPILER "${CAPNP_EXECUTABLE}")
 endif()
 
+# Set up the capnp compile command with PATH modification on Linux
+if(UNIX AND NOT APPLE)
+    if (TARGET CapnProto::capnp_tool)
+        set(CAPNP_COMPILE_COMMAND ${CMAKE_COMMAND} -E env "PATH=$<TARGET_FILE_DIR:CapnProto::capnp_tool>:$ENV{PATH}" ${CAPNP_COMPILER} compile -o c++:. "driver.capnp")
+    elseif (DEFINED CAPNP_EXECUTABLE)
+        get_filename_component(CAPNP_DIR "${CAPNP_EXECUTABLE}" DIRECTORY)
+        set(CAPNP_COMPILE_COMMAND ${CMAKE_COMMAND} -E env "PATH=${CAPNP_DIR}:$ENV{PATH}" ${CAPNP_COMPILER} compile -o c++:. "driver.capnp")
+    else()
+        set(CAPNP_COMPILE_COMMAND ${CAPNP_COMPILER} compile -o c++:. "driver.capnp")
+    endif()
+else()
+    set(CAPNP_COMPILE_COMMAND ${CAPNP_COMPILER} compile -o c++:. "driver.capnp")
+endif()
+
 add_custom_command(
     OUTPUT "${CAPNP_GEN_HDR}" "${CAPNP_GEN_SRC}"
     COMMAND ${CMAKE_COMMAND} -E make_directory "${CAPNP_OUT_DIR}"
     COMMAND ${CMAKE_COMMAND} -E copy_if_different "${CAPNP_SCHEMA}" "${CAPNP_SCHEMA_COPY}"
-    COMMAND ${CAPNP_COMPILER} compile -o c++:. "driver.capnp"
+    COMMAND ${CAPNP_COMPILE_COMMAND}
     DEPENDS "${CAPNP_SCHEMA}"
     WORKING_DIRECTORY "${CAPNP_OUT_DIR}"
     COMMENT "Generating Cap'n Proto C++ from driver.capnp"
@@ -96,25 +109,16 @@ set(OPENVR_ROOT "${CMAKE_CURRENT_LIST_DIR}/../vendor/openvr")
 set(OPENVR_INCLUDE_DIR "${OPENVR_ROOT}/headers")
 
 if (WIN32)
-    if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-        set(OPENVR_IMPLIB   "${OPENVR_ROOT}/lib/win64/openvr_api.lib")
-        set(OPENVR_RUNTIME  "${OPENVR_ROOT}/bin/win64/openvr_api.dll")
-    else()
-        set(OPENVR_IMPLIB   "${OPENVR_ROOT}/lib/win32/openvr_api.lib")
-        set(OPENVR_RUNTIME  "${OPENVR_ROOT}/bin/win32/openvr_api.dll")
-    endif()
+    set(OPENVR_IMPLIB   "${OPENVR_ROOT}/lib/win64/openvr_api.lib")
+    set(OPENVR_RUNTIME  "${OPENVR_ROOT}/bin/win64/openvr_api.dll")
     add_library(openvr::openvr SHARED IMPORTED)
     set_target_properties(openvr::openvr PROPERTIES
         IMPORTED_IMPLIB "${OPENVR_IMPLIB}"
         IMPORTED_LOCATION "${OPENVR_RUNTIME}"
         INTERFACE_INCLUDE_DIRECTORIES "${OPENVR_INCLUDE_DIR}"
     )
 elseif(UNIX AND NOT APPLE)
-    if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-        set(OPENVR_RUNTIME "${OPENVR_ROOT}/lib/linux64/libopenvr_api.so")
-    else()
-        set(OPENVR_RUNTIME "${OPENVR_ROOT}/lib/linux32/libopenvr_api.so")
-    endif()
+    set(OPENVR_RUNTIME "${OPENVR_ROOT}/lib/linux64/libopenvr_api.so")
     add_library(openvr::openvr SHARED IMPORTED)
     set_target_properties(openvr::openvr PROPERTIES
         IMPORTED_LOCATION "${OPENVR_RUNTIME}"
@@ -147,13 +151,10 @@ else()
 endif()
 
 if (WIN32)
-    if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-        set(PACK_BIN_DIR "${PACK_ROOT}/bin/win64")
-    else()
-        set(PACK_BIN_DIR "${PACK_ROOT}/bin/win32")
-    endif()
+    set(PACK_BIN_DIR "${PACK_ROOT}/bin/win64")
+elseif(UNIX AND NOT APPLE)
+    set(PACK_BIN_DIR "${PACK_ROOT}/bin/linux64")
 else()
-    # Default bin directory if non-Windows
     set(PACK_BIN_DIR "${PACK_ROOT}/bin")
 endif()
 
@@ -165,9 +166,31 @@ endif()
 
 add_custom_command(TARGET ${DRIVER_TARGET_NAME} POST_BUILD
     COMMAND ${CMAKE_COMMAND} -E make_directory "${PACK_BIN_DIR}"
-    COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:${DRIVER_TARGET_NAME}>" "${PACK_BIN_DIR}"
     COMMAND ${CMAKE_COMMAND} -E copy_if_different "${MANIFEST_SRC}" "${PACK_ROOT}/driver.vrdrivermanifest"
     COMMENT "Packing driver files to ${PACK_ROOT}"
     VERBATIM
 )
+
+if(UNIX AND NOT APPLE)
+    add_custom_command(TARGET ${DRIVER_TARGET_NAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different 
+            "$<TARGET_FILE:${DRIVER_TARGET_NAME}>" 
+            "${PACK_BIN_DIR}/$<TARGET_FILE_BASE_NAME:${DRIVER_TARGET_NAME}>$<TARGET_FILE_SUFFIX:${DRIVER_TARGET_NAME}>"
+        COMMENT "Copying driver library without lib prefix"
+        VERBATIM
+    )
+else()
+    add_custom_command(TARGET ${DRIVER_TARGET_NAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different "$<TARGET_FILE:${DRIVER_TARGET_NAME}>" "${PACK_BIN_DIR}"
+        COMMENT "Copying driver library"
+        VERBATIM
+    )
+endif()
+
+
+if (TARGET openvr::openvr)
+    add_custom_command(TARGET ${DRIVER_TARGET_NAME} POST_BUILD
+        COMMAND ${CMAKE_COMMAND} -E copy_if_different "${OPENVR_RUNTIME}" "${PACK_BIN_DIR}"
+        VERBATIM)
+endif()
 # --------------------------------------------------------------
diff --git a/driver_Amethyst/include/BodyTracker.h b/driver_Amethyst/include/BodyTracker.h
@@ -2,6 +2,7 @@
 #pragma once
 #include <filesystem>
 #include <map>
+#include <format>
 #include <openvr_driver.h>
 #include <driver.capnp.h>
 
diff --git a/driver_Amethyst/src/ServerProvider.cpp b/driver_Amethyst/src/ServerProvider.cpp
@@ -322,7 +322,16 @@ namespace amethyst::driver::implementation
     };
 }
 
-extern "C" __declspec(dllexport) void* HmdDriverFactory(const char* pInterfaceName, int* pReturnCode)
+#if defined(_MSC_VER)
+    #define EXPORT __declspec(dllexport)
+#elif defined(__GNUC__)
+    #define EXPORT __attribute__((visibility("default")))
+#else
+    #define EXPORT
+    #pragma warning Unknown dynamic link import/export semantics.
+#endif
+
+extern "C" EXPORT void* HmdDriverFactory(const char* pInterfaceName, int* pReturnCode)
 {
     static amethyst::driver::implementation::ServerProvider k2_server_provider;
     static amethyst::driver::implementation::DriverWatchdog k2_watchdog_driver;
@@ -340,4 +349,6 @@ extern "C" __declspec(dllexport) void* HmdDriverFactory(const char* pInterfaceNa
 
     if (pReturnCode)
         *pReturnCode = vr::VRInitError_Init_InterfaceNotFound;
+
+    return nullptr;
 }
diff --git a/plugin_OpenVR/OpenVR.cs b/plugin_OpenVR/OpenVR.cs
@@ -807,7 +807,7 @@ private async Task<int> InitAmethystServerAsync(int target)
             await Dispatcher.InvokeAsync(() =>
             {
                 Host?.Log("Searching for the driver service...");
-                TcpClient = new TcpRpcClient("localhost", target);
+                TcpClient = new TcpRpcClient("127.0.0.1", target);
                 //MidlayerExtensions.AddBuffering(client);
 
                 TcpClient.WhenConnected!.Wait(1000);
diff --git a/plugin_OpenVR/plugin_OpenVR.csproj b/plugin_OpenVR/plugin_OpenVR.csproj
@@ -30,7 +30,8 @@
     <PackageReference Include="Avalonia" Version="11.3.2" />
     <PackageReference Include="Avalonia.AvaloniaEdit" Version="11.3.0" />
     <PackageReference Include="Capnp.Net.Runtime" Version="1.3.118" />
-    <PackageReference Include="CapnpC.CSharp.MsBuild.Generation" Version="1.3.118" />
+<!--    <PackageReference Include="CapnpC.CSharp.MsBuild.Generation" Version="1.3.118" />-->
+    <PackageReference Include="FluentAvaloniaUI" Version="2.4.0" />
     <PackageReference Include="FluentAvaloniaUI" Version="2.4.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting" Version="4.14.0" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
diff --git a/vendor/capnp b/vendor/capnp
@@ -0,0 +1 @@
+Subproject commit d135c9ca5e15219eaf131dfce1a41afdbaea9aab

Original file line number	Diff line number	Diff line change
`@@ -807,7 +807,7 @@ private async Task<int> InitAmethystServerAsync(int target)`
`807`	`807`	`await Dispatcher.InvokeAsync(() =>`
`808`	`808`	`{`
`809`	`809`	`Host?.Log("Searching for the driver service...");`
`810`		`- TcpClient = new TcpRpcClient("localhost", target);`
	`810`	`+ TcpClient = new TcpRpcClient("127.0.0.1", target);`
`811`	`811`	`//MidlayerExtensions.AddBuffering(client);`
`812`	`812`
`813`	`813`	`TcpClient.WhenConnected!.Wait(1000);`