mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-07-25 19:44:57 +00:00
code: Fix a few build errors
This commit is contained in:
parent
0608dd947b
commit
937ea71f70
1
.github/linux-appimage-qt.sh
vendored
1
.github/linux-appimage-qt.sh
vendored
@ -7,6 +7,7 @@ if [[ -z $GITHUB_WORKSPACE ]]; then
|
|||||||
GITHUB_WORKSPACE="${PWD%/*}"
|
GITHUB_WORKSPACE="${PWD%/*}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
export Qt6_DIR="/usr/lib/qt6"
|
||||||
export PATH="$Qt6_DIR/bin:$PATH"
|
export PATH="$Qt6_DIR/bin:$PATH"
|
||||||
|
|
||||||
# Prepare Tools for building the AppImage
|
# Prepare Tools for building the AppImage
|
||||||
|
15
.github/workflows/linux-qt.yml
vendored
15
.github/workflows/linux-qt.yml
vendored
@ -24,19 +24,8 @@ jobs:
|
|||||||
|
|
||||||
- name: Install misc packages
|
- name: Install misc packages
|
||||||
run: >
|
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 qt6-base-dev
|
||||||
|
|
||||||
- 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
|
|
||||||
|
|
||||||
- name: Configure CMake
|
- 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
|
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ -DENABLE_QT_GUI=ON
|
||||||
|
|
||||||
|
2
.github/workflows/linux.yml
vendored
2
.github/workflows/linux.yml
vendored
@ -25,7 +25,7 @@ jobs:
|
|||||||
|
|
||||||
- name: Install misc packages
|
- name: Install misc packages
|
||||||
run: >
|
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
|
- name: Configure CMake
|
||||||
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
|
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++
|
||||||
|
@ -219,12 +219,12 @@ struct AddressSpace::Impl {
|
|||||||
UNREACHABLE();
|
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();
|
UNREACHABLE();
|
||||||
return nullptr;
|
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();
|
UNREACHABLE();
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
@ -17,7 +17,7 @@ void* PS4_SYSV_ABI internal_memcpy(void* dest, const void* src, size_t n) {
|
|||||||
return std::memcpy(dest, src, 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
|
#ifdef _WIN64
|
||||||
return memcpy_s(dest, destsz, src, count);
|
return memcpy_s(dest, destsz, src, count);
|
||||||
#else
|
#else
|
||||||
@ -26,7 +26,7 @@ int PS4_SYSV_ABI internal_memcpy_s(void* dest, rsize_t destsz, const void* src,
|
|||||||
#endif
|
#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
|
#ifdef _WIN64
|
||||||
return strcpy_s(dest, dest_size, src);
|
return strcpy_s(dest, dest_size, src);
|
||||||
#else
|
#else
|
||||||
|
@ -12,8 +12,8 @@ class SymbolsResolver;
|
|||||||
namespace Libraries::LibcInternal {
|
namespace Libraries::LibcInternal {
|
||||||
void* PS4_SYSV_ABI internal_memset(void* s, int c, size_t n);
|
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);
|
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_memcpy_s(void* dest, size_t destsz, const void* src, size_t count);
|
||||||
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);
|
||||||
int PS4_SYSV_ABI internal_memcmp(const void* s1, const void* s2, size_t n);
|
int PS4_SYSV_ABI internal_memcmp(const void* s1, const void* s2, size_t n);
|
||||||
float PS4_SYSV_ABI internal_expf(float x);
|
float PS4_SYSV_ABI internal_expf(float x);
|
||||||
|
|
||||||
|
@ -156,7 +156,7 @@ void PKGViewer::ProcessPKGInfo() {
|
|||||||
if (isFlagSet(pkg_content_flag, flag.first)) {
|
if (isFlagSet(pkg_content_flag, flag.first)) {
|
||||||
if (!flagss.isEmpty())
|
if (!flagss.isEmpty())
|
||||||
flagss.append(", ");
|
flagss.append(", ");
|
||||||
flagss.append(flag.second);
|
flagss.append(QString::fromStdString(flag.second));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -319,7 +319,7 @@ struct PM4CmdEventWriteEop {
|
|||||||
switch (int_sel.Value()) {
|
switch (int_sel.Value()) {
|
||||||
case InterruptSelect::None: {
|
case InterruptSelect::None: {
|
||||||
// No interrupt
|
// No interrupt
|
||||||
// break;
|
break;
|
||||||
}
|
}
|
||||||
case InterruptSelect::IrqWhenWriteConfirm: {
|
case InterruptSelect::IrqWhenWriteConfirm: {
|
||||||
Platform::IrqC::Instance()->Signal(Platform::InterruptId::GfxEop);
|
Platform::IrqC::Instance()->Signal(Platform::InterruptId::GfxEop);
|
||||||
|
Loading…
Reference in New Issue
Block a user