From 937ea71f705d05990e73f57e5e439b201b647b25 Mon Sep 17 00:00:00 2001 From: raphaelthegreat <47210458+raphaelthegreat@users.noreply.github.com> Date: Thu, 16 May 2024 14:01:23 +0300 Subject: [PATCH] code: Fix a few build errors --- .github/linux-appimage-qt.sh | 1 + .github/workflows/linux-qt.yml | 15 ++------------- .github/workflows/linux.yml | 2 +- src/core/address_space.cpp | 4 ++-- .../libraries/libc_internal/libc_internal.cpp | 4 ++-- src/core/libraries/libc_internal/libc_internal.h | 4 ++-- src/qt_gui/pkg_viewer.cpp | 2 +- src/video_core/amdgpu/pm4_cmds.h | 2 +- 8 files changed, 12 insertions(+), 22 deletions(-) diff --git a/.github/linux-appimage-qt.sh b/.github/linux-appimage-qt.sh index 76853fdd0..870172457 100755 --- a/.github/linux-appimage-qt.sh +++ b/.github/linux-appimage-qt.sh @@ -7,6 +7,7 @@ if [[ -z $GITHUB_WORKSPACE ]]; then GITHUB_WORKSPACE="${PWD%/*}" fi +export Qt6_DIR="/usr/lib/qt6" export PATH="$Qt6_DIR/bin:$PATH" # Prepare Tools for building the AppImage diff --git a/.github/workflows/linux-qt.yml b/.github/workflows/linux-qt.yml index c8e7efe40..c6e1b5cce 100644 --- a/.github/workflows/linux-qt.yml +++ b/.github/workflows/linux-qt.yml @@ -24,19 +24,8 @@ jobs: - name: Install misc packages run: > - sudo apt-get update && sudo apt install clang build-essential - - - name: Install Qt - uses: jurplel/install-qt-action@v3 - with: - version: 6.7.0 - host: linux - target: desktop - #arch: clang++-17 - dir: ${{ runner.temp }} - #modules: qtcharts qt3d - setup-python: false - + sudo apt-get update && sudo apt install libx11-dev libxext-dev libwayland-dev libfuse2 clang build-essential qt6-base-dev + - name: Configure CMake run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DENABLE_QT_GUI=ON diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index d4963ed60..a24a82aa9 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -25,7 +25,7 @@ jobs: - name: Install misc packages run: > - sudo apt-get update && sudo apt install clang build-essential + sudo apt-get update && sudo apt install libx11-dev libxext-dev libwayland-dev libfuse2 clang build-essential - name: Configure CMake run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ diff --git a/src/core/address_space.cpp b/src/core/address_space.cpp index fd0d5fcf7..f10527b9e 100644 --- a/src/core/address_space.cpp +++ b/src/core/address_space.cpp @@ -219,12 +219,12 @@ struct AddressSpace::Impl { UNREACHABLE(); } - void* MapUser(VAddr virtual_addr, PAddr phys_addr, size_t size, ULONG prot) { + void* MapUser(VAddr virtual_addr, PAddr phys_addr, size_t size, PosixPageProtection prot) { UNREACHABLE(); return nullptr; } - void* MapPrivate(VAddr virtual_addr, size_t size, u64 alignment, ULONG prot) { + void* MapPrivate(VAddr virtual_addr, size_t size, u64 alignment, PosixPageProtection prot) { UNREACHABLE(); return nullptr; } diff --git a/src/core/libraries/libc_internal/libc_internal.cpp b/src/core/libraries/libc_internal/libc_internal.cpp index 9fd7906ab..93c980759 100644 --- a/src/core/libraries/libc_internal/libc_internal.cpp +++ b/src/core/libraries/libc_internal/libc_internal.cpp @@ -17,7 +17,7 @@ void* PS4_SYSV_ABI internal_memcpy(void* dest, const void* src, size_t n) { return std::memcpy(dest, src, n); } -int PS4_SYSV_ABI internal_memcpy_s(void* dest, rsize_t destsz, const void* src, rsize_t count) { +int PS4_SYSV_ABI internal_memcpy_s(void* dest, size_t destsz, const void* src, size_t count) { #ifdef _WIN64 return memcpy_s(dest, destsz, src, count); #else @@ -26,7 +26,7 @@ int PS4_SYSV_ABI internal_memcpy_s(void* dest, rsize_t destsz, const void* src, #endif } -int PS4_SYSV_ABI internal_strcpy_s(char* dest, rsize_t dest_size, const char* src) { +int PS4_SYSV_ABI internal_strcpy_s(char* dest, size_t dest_size, const char* src) { #ifdef _WIN64 return strcpy_s(dest, dest_size, src); #else diff --git a/src/core/libraries/libc_internal/libc_internal.h b/src/core/libraries/libc_internal/libc_internal.h index e154eff6c..819c15b4f 100644 --- a/src/core/libraries/libc_internal/libc_internal.h +++ b/src/core/libraries/libc_internal/libc_internal.h @@ -12,8 +12,8 @@ class SymbolsResolver; namespace Libraries::LibcInternal { void* PS4_SYSV_ABI internal_memset(void* s, int c, size_t n); void* PS4_SYSV_ABI internal_memcpy(void* dest, const void* src, size_t n); -int PS4_SYSV_ABI internal_memcpy_s(void* dest, rsize_t destsz, const void* src, rsize_t count); -int PS4_SYSV_ABI internal_strcpy_s(char* dest, rsize_t dest_size, const char* src); +int PS4_SYSV_ABI internal_memcpy_s(void* dest, size_t destsz, const void* src, size_t count); +int PS4_SYSV_ABI internal_strcpy_s(char* dest, size_t dest_size, const char* src); int PS4_SYSV_ABI internal_memcmp(const void* s1, const void* s2, size_t n); float PS4_SYSV_ABI internal_expf(float x); diff --git a/src/qt_gui/pkg_viewer.cpp b/src/qt_gui/pkg_viewer.cpp index ac792d81f..9bccb4822 100644 --- a/src/qt_gui/pkg_viewer.cpp +++ b/src/qt_gui/pkg_viewer.cpp @@ -156,7 +156,7 @@ void PKGViewer::ProcessPKGInfo() { if (isFlagSet(pkg_content_flag, flag.first)) { if (!flagss.isEmpty()) flagss.append(", "); - flagss.append(flag.second); + flagss.append(QString::fromStdString(flag.second)); } } diff --git a/src/video_core/amdgpu/pm4_cmds.h b/src/video_core/amdgpu/pm4_cmds.h index 2acd2a7c3..e26830cdc 100644 --- a/src/video_core/amdgpu/pm4_cmds.h +++ b/src/video_core/amdgpu/pm4_cmds.h @@ -319,7 +319,7 @@ struct PM4CmdEventWriteEop { switch (int_sel.Value()) { case InterruptSelect::None: { // No interrupt - // break; + break; } case InterruptSelect::IrqWhenWriteConfirm: { Platform::IrqC::Instance()->Signal(Platform::InterruptId::GfxEop);