RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-01-22 00:20:40 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

win32_target_cellos-kernel
Some checks failed
Formatting check / formatting-check (push) Has been cancelled
Details
Build RPCSX / build-linux (push) Has been cancelled
Details
Build RPCSX / build-android (arm64-v8a, armv8-a) (push) Has been cancelled
Details
Build RPCSX / build-android (arm64-v8a, armv8.1-a) (push) Has been cancelled
Details
Build RPCSX / build-android (arm64-v8a, armv8.2-a) (push) Has been cancelled
Details
Build RPCSX / build-android (arm64-v8a, armv8.4-a) (push) Has been cancelled
Details
Build RPCSX / build-android (arm64-v8a, armv8.5-a) (push) Has been cancelled
Details
Build RPCSX / build-android (arm64-v8a, armv9-a) (push) Has been cancelled
Details
Build RPCSX / build-android (arm64-v8a, armv9.1-a) (push) Has been cancelled
Details
Build RPCSX / build-android (x86_64, x86-64) (push) Has been cancelled
Details

Browse source
This commit is contained in:
Darkhost1999 2026-01-09 18:55:24 -06:00 committed by DHrpcs3
parent 2b6398075c
commit b41e09a047
21 changed files with 35 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
3rdparty/CMakeLists.txt vendored
View file

@ -99,6 +99,14 @@ if (COMPILE_FFMPEG)
import_ffmpeg_library(swscale)
import_ffmpeg_library(swresample)
import_ffmpeg_library(postproc)
add_library(3rdparty_ffmpeg INTERFACE)
target_link_libraries(3rdparty_ffmpeg INTERFACE
ffmpeg::avformat
ffmpeg::avcodec
ffmpeg::swscale
ffmpeg::avutil
ffmpeg::avfilter
ffmpeg::swresample)
endif()
# Dummy target to use when lib isn't available

3
cmake/ConfigureCompiler.cmake
View file

@ -121,7 +121,8 @@ else()
endif()
# Specify C++ library to use as standard C++ when using clang (not required on linux due to GNU)
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND (APPLE OR WIN32))
if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND (APPLE OR WIN32) AND NOT CMAKE_CROSSCOMPILING)
add_compile_options(-stdlib=libc++)
endif()
add_compile_options(-municode)
endif()

5
kernel/cellos/CMakeLists.txt
View file

@ -60,6 +60,7 @@ PRIVATE
)
target_link_libraries(cellos-kernel PUBLIC
kernel
rpcs3_core # FIXME: remove
3rdparty::soundtouch # FIXME: remove
3rdparty::flatbuffers # FIXME: remove
@ -68,3 +69,7 @@ target_link_libraries(cellos-kernel PUBLIC
3rdparty::libusb # FIXME: remove
3rdparty::rtmidi # FIXME: remove
)
if (WIN32 AND NOT MSVC)
target_compile_options(cellos-kernel PUBLIC -municode)
endif()

2
kernel/cellos/include/cellos/sys_net/lv2_socket.h
View file

@ -11,7 +11,7 @@
#include "util/mutex.h"
#ifdef _WIN32
#include <WS2tcpip.h>
#include <ws2tcpip.h>
#include <winsock2.h>
#else
#ifdef __clang__

2
kernel/cellos/include/cellos/sys_net/lv2_socket_native.h
View file

@ -2,7 +2,7 @@
#pragma once
#ifdef _WIN32
#include <WS2tcpip.h>
#include <ws2tcpip.h>
#include <winsock2.h>
#else
#ifdef __clang__

2
kernel/cellos/include/cellos/sys_net/lv2_socket_p2ps.h
View file

@ -2,7 +2,7 @@
#include <deque>
#ifdef _WIN32
#include <WS2tcpip.h>
#include <ws2tcpip.h>
#include <winsock2.h>
#else
#ifdef __clang__

2
kernel/cellos/include/cellos/sys_net/nt_p2p_port.h
View file

@ -5,7 +5,7 @@
#include "lv2_socket_p2ps.h"
#ifdef _WIN32
#include <WS2tcpip.h>
#include <ws2tcpip.h>
#include <winsock2.h>
#else
#ifdef __clang__

2
kernel/cellos/include/cellos/sys_net/sys_net_helpers.h
View file

@ -1,7 +1,7 @@
#pragma once
#ifdef _WIN32
#include <WS2tcpip.h>
#include <ws2tcpip.h>
#include <winsock2.h>
#else
#ifdef __clang__

2
kernel/cellos/src/sys_net.cpp
View file

@ -9,7 +9,7 @@
#include "sys_sync.h"
#ifdef _WIN32
#include <WS2tcpip.h>
#include <ws2tcpip.h>
#include <winsock2.h>
#else
#ifdef __clang__

2
kernel/cellos/src/sys_ss.cpp
View file

@ -13,8 +13,8 @@
#include <unordered_set>
#ifdef _WIN32
#include <bcrypt.h>
#include <windows.h>
#include <bcrypt.h> //Must be included after windows.h for mingw
#endif
struct lv2_update_manager {

2
kernel/cellos/src/sys_time.cpp
View file

@ -359,7 +359,7 @@ error_code sys_time_get_current_time(vm::ptr<s64> sec, vm::ptr<s64> nsec) {
// Get time difference in nanoseconds (using 128 bit accumulator)
const u64 diff_sl = diff_base * 1000000000ull;
const u64 diff_sh = rx::umulh64(diff_base, 1000000000ull);
const u64 diff = utils::udiv128(diff_sh, diff_sl, s_time_aux_info.perf_freq);
const u64 diff = rx::udiv128(diff_sh, diff_sl, s_time_aux_info.perf_freq);
// get time since Epoch in nanoseconds
const u64 time = s_time_aux_info.start_ftime * 100u +

2
rpcs3/Emu/GDB.cpp
View file

@ -13,7 +13,7 @@
#ifdef _WIN32
#include <WinSock2.h>
#include <WS2tcpip.h>
#include <ws2tcpip.h>
#include <afunix.h> // sockaddr_un
#else
#ifdef __clang__

2
rpcs3/Emu/NP/ip_address.h
View file

@ -10,7 +10,7 @@
#ifdef _WIN32
#include <winsock2.h>
#include <WS2tcpip.h>
#include <ws2tcpip.h>
#else
#ifdef __clang__
#pragma GCC diagnostic push

2
rpcs3/Emu/NP/np_dnshook.cpp
View file

@ -8,7 +8,7 @@
#include <regex>
#ifdef _WIN32
#include <WS2tcpip.h>
#include <ws2tcpip.h>
#else
#ifdef __clang__
#pragma GCC diagnostic push

2
rpcs3/Emu/NP/np_handler.cpp
View file

@ -19,7 +19,7 @@
#ifdef _WIN32
#include <winsock2.h>
#include <WS2tcpip.h>
#include <ws2tcpip.h>
#include <iphlpapi.h>
#else
#ifdef __clang__

2
rpcs3/Emu/NP/np_helpers.cpp
View file

@ -4,7 +4,7 @@
#include "rpcn_client.h"
#ifdef _WIN32
#include <WS2tcpip.h>
#include <ws2tcpip.h>
#endif
namespace np

2
rpcs3/Emu/NP/rpcn_client.cpp
View file

@ -20,7 +20,7 @@
#ifdef _WIN32
#include <winsock2.h>
#include <WS2tcpip.h>
#include <ws2tcpip.h>
#else
#ifdef __clang__
#pragma GCC diagnostic push

1
rpcs3/Emu/NP/signaling_handler.cpp
View file

@ -4,7 +4,6 @@
#include "signaling_handler.h"
#include "Emu/IdManager.h"
#include "rpcsx/fw/ps3/cellSysutil.h"
#include "np_handler.h"
#include "Emu/NP/vport0.h"
#include "Emu/NP/np_helpers.h"

4
rpcs3/util/Thread.cpp
View file

@ -19,7 +19,7 @@
#ifdef _WIN32
#include <windows.h>
#include <Psapi.h>
#include <psapi.h>
#include <process.h>
#include <sysinfoapi.h>
@ -1494,7 +1494,7 @@ bool handle_access_violation(u32 addr, bool is_writing, ucontext_t* context) noe
{
if (auto mem = vm::get(vm::any, addr))
{
reader_lock lock(pf_entries.mutex);
::reader_lock lock(pf_entries.mutex);
for (const auto& entry : pf_entries.entries)
{

6
rpcs3/util/logs.cpp
View file

@ -489,7 +489,7 @@ logs::file_writer::file_writer(const std::string& name, u64 max_size)
#ifdef _WIN32
// Autodelete compressed log file
FILE_DISPOSITION_INFO disp{};
disp.DeleteFileW = true;
disp.DeleteFile = true;
SetFileInformationByHandle(m_fout2.get_handle(), FileDispositionInfo, &disp, sizeof(disp));
#endif
@ -558,7 +558,7 @@ logs::file_writer::~file_writer()
#ifdef _WIN32
// Cancel compressed log file auto-deletion
FILE_DISPOSITION_INFO disp;
disp.DeleteFileW = false;
disp.DeleteFile = false;
SetFileInformationByHandle(m_fout2.get_handle(), FileDispositionInfo, &disp, sizeof(disp));
#else
// Restore compressed log file permissions
@ -744,7 +744,7 @@ void logs::file_writer::close_prematurely()
#ifdef _WIN32
// Cancel compressed log file auto-deletion
FILE_DISPOSITION_INFO disp;
disp.DeleteFileW = false;
disp.DeleteFile = false;
SetFileInformationByHandle(m_fout2.get_handle(), FileDispositionInfo, &disp, sizeof(disp));
#else
// Restore compressed log file permissions

2
rpcs3/util/stack_trace.cpp
View file

@ -5,7 +5,7 @@
#define WIN32_LEAN_AND_MEAN
#include <windows.h>
#define DBGHELP_TRANSLATE_TCHAR
#include <DbgHelp.h>
#include <dbghelp.h>
#include <codecvt>
#else
#include <execinfo.h>