Browse Source

fix compile on non-msvc windows and linux

remotes/1785372757367212240/tmp_refs/heads/variable-page-size
Exverge 1 month ago
parent
commit
0ab7e58d39
No known key found for this signature in database GPG Key ID: DAD399BCC5FB77E4
  1. 4
      src/common/host_memory.h
  2. 2
      src/core/arm/nce/arm_nce.cpp
  3. 7
      src/core/arm/nce/arm_nce_asm_definitions.h
  4. 6
      src/core/arm/nce/guest_context.h
  5. 2
      src/core/hle/kernel/k_memory_manager.cpp

4
src/common/host_memory.h

@ -9,7 +9,7 @@
#include <memory> #include <memory>
#include <optional> #include <optional>
#ifndef _MSC_VER
#ifndef _WIN32
#include <unistd.h> #include <unistd.h>
#endif #endif
@ -19,7 +19,7 @@
namespace Common { namespace Common {
#ifndef _MSC_VER
#ifndef _WIN32
const size_t HostPageSize = sysconf(_SC_PAGESIZE); const size_t HostPageSize = sysconf(_SC_PAGESIZE);
#else #else
constexpr size_t HostPageSize = 0x1000; constexpr size_t HostPageSize = 0x1000;

2
src/core/arm/nce/arm_nce.cpp

@ -16,8 +16,6 @@
#include "core/hle/kernel/k_process.h" #include "core/hle/kernel/k_process.h"
#include <sys/syscall.h>
namespace Core { namespace Core {
namespace { namespace {

7
src/core/arm/nce/arm_nce_asm_definitions.h

@ -1,5 +1,8 @@
/* SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project */
/* SPDX-License-Identifier: GPL-2.0-or-later */
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once #pragma once

6
src/core/arm/nce/guest_context.h

@ -1,3 +1,6 @@
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2023 yuzu Emulator Project
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
@ -10,8 +13,11 @@
#include "core/arm/arm_interface.h" #include "core/arm/arm_interface.h"
#include "core/arm/nce/arm_nce_asm_definitions.h" #include "core/arm/nce/arm_nce_asm_definitions.h"
#ifdef __linux__
#include <unistd.h> #include <unistd.h>
#include <sys/syscall.h>
#include <signal.h> #include <signal.h>
#endif
namespace Core { namespace Core {

2
src/core/hle/kernel/k_memory_manager.cpp

@ -1,4 +1,4 @@
// SPDX-FileCopyrightText: Copyright 2025 Eden Emulator Project
// SPDX-FileCopyrightText: Copyright 2026 Eden Emulator Project
// SPDX-License-Identifier: GPL-3.0-or-later // SPDX-License-Identifier: GPL-3.0-or-later
// SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project // SPDX-FileCopyrightText: Copyright 2020 yuzu Emulator Project

Loading…
Cancel
Save