archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-02 04:51:26 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

CMake: fix gcc build

Browse source
This commit is contained in:
Megamouse 2025-04-29 23:43:01 +02:00
parent 19cc93437e
commit 9897a80216
13 changed files with 55 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Utilities/File.cpp
View file

@ -1707,7 +1707,7 @@ fs::file fs::file::from_native_handle(native_handle handle)
fs::file result;
#ifdef _WIN32
result.m_file = std::make_unique<windows_file>((const HANDLE)handle);
result.m_file = std::make_unique<windows_file>(static_cast<HANDLE>(handle));
#else
result.m_file = std::make_unique<unix_file>(handle);
#endif

5
rpcs3/CMakeLists.txt
View file

@ -64,6 +64,9 @@ if (NOT ANDROID)
AUTOUIC ON)
target_link_libraries(rpcs3_lib
PUBLIC
3rdparty::stblib
3rdparty::libevdev
PRIVATE
rpcs3_emu
rpcs3_ui
@ -93,7 +96,7 @@ if (NOT ANDROID)
endif()
if(WIN32)
target_link_libraries(rpcs3_lib PRIVATE bcrypt ws2_32 Iphlpapi Winmm Psapi gdi32 setupapi pdh)
target_link_libraries(rpcs3_lib PRIVATE ws2_32 Iphlpapi Winmm Psapi gdi32 setupapi)
else()
target_link_libraries(rpcs3_lib PRIVATE ${CMAKE_DL_LIBS})
endif()

75
rpcs3/Emu/CMakeLists.txt
View file

@ -5,6 +5,7 @@ add_library(rpcs3_emu STATIC
localized_string.cpp
savestate_utils.cpp
scoped_progress_dialog.cpp
stb_image.cpp
System.cpp
system_config.cpp
system_config_types.cpp
@ -32,17 +33,6 @@ if(HAS_MEMORY_BREAKPOINTS)
target_compile_definitions(rpcs3_emu PRIVATE RPCS3_HAS_MEMORY_BREAKPOINTS)
endif()
target_link_libraries(rpcs3_emu
PRIVATE
3rdparty::zlib 3rdparty::yaml-cpp 3rdparty::zstd
PUBLIC
3rdparty::libevdev 3rdparty::flatbuffers)
find_package(Threads REQUIRED)
target_link_libraries(rpcs3_emu
PUBLIC Threads::Threads)
# For stdafx.h
target_include_directories(rpcs3_emu
PUBLIC
@ -95,10 +85,6 @@ endif()
target_include_directories(rpcs3_emu PUBLIC "${CMAKE_SOURCE_DIR}")
target_link_libraries(rpcs3_emu
PUBLIC
3rdparty::pugixml)
set_source_files_properties("../../Utilities/JITLLVM.cpp" "../../Utilities/JITASM.cpp" PROPERTIES
COMPILE_FLAGS "$<IF:$<CXX_COMPILER_ID:MSVC>,/GR-,-fno-rtti>"
SKIP_PRECOMPILE_HEADERS ON
@ -169,24 +155,9 @@ if(WIN32)
Audio/XAudio2/xaudio2_enumerator.cpp
)
target_compile_definitions(rpcs3_emu PRIVATE UNICODE _UNICODE _WIN32_WINNT=0x0A00)
target_link_libraries(rpcs3_emu PRIVATE pdh bcrypt)
endif()
target_link_libraries(rpcs3_emu
PUBLIC
3rdparty::openal)
target_link_libraries(rpcs3_emu
PUBLIC
3rdparty::cubeb)
target_link_libraries(rpcs3_emu
PUBLIC
3rdparty::soundtouch)
target_link_libraries(rpcs3_emu
PUBLIC
3rdparty::miniupnpc)
# Cell
target_sources(rpcs3_emu PRIVATE
Cell/ErrorCodes.cpp
@ -400,11 +371,6 @@ if(NOT MSVC)
)
endif()
target_link_libraries(rpcs3_emu
PRIVATE
3rdparty::stblib 3rdparty::libpng)
# CPU
target_sources(rpcs3_emu PRIVATE
CPU/CPUThread.cpp
@ -420,15 +386,13 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "ARM64|arm64|aarch64")
)
endif()
target_link_libraries(rpcs3_emu
PUBLIC 3rdparty::llvm 3rdparty::asmjit)
# Io
target_sources(rpcs3_emu PRIVATE
Io/Buzz.cpp
Io/camera_config.cpp
Io/Dimensions.cpp
Io/evdev_gun_handler.cpp
Io/GameTablet.cpp
Io/GHLtar.cpp
Io/GunCon3.cpp
@ -456,10 +420,6 @@ target_sources(rpcs3_emu PRIVATE
Io/usio.cpp
)
target_link_libraries(rpcs3_emu PRIVATE
3rdparty::rtmidi
)
# Np
target_sources(rpcs3_emu PRIVATE
NP/fb_helpers.cpp
@ -654,14 +614,35 @@ if(TARGET 3rdparty_vulkan)
)
endif()
find_package(Threads REQUIRED)
target_link_libraries(rpcs3_emu
PUBLIC
3rdparty::ffmpeg 3rdparty::sdl3
3rdparty::opengl 3rdparty::stblib
3rdparty::vulkan 3rdparty::glew
3rdparty::libusb 3rdparty::wolfssl
3rdparty::llvm
3rdparty::asmjit
3rdparty::ffmpeg
3rdparty::sdl3
3rdparty::opengl
3rdparty::stblib
3rdparty::vulkan
3rdparty::glew
3rdparty::libusb
3rdparty::wolfssl
3rdparty::openal
3rdparty::cubeb
3rdparty::soundtouch
3rdparty::miniupnpc
3rdparty::libevdev
3rdparty::flatbuffers
3rdparty::pugixml
Threads::Threads
PRIVATE
3rdparty::glslang
3rdparty::libpng
3rdparty::rtmidi
3rdparty::yaml-cpp
3rdparty::zlib
3rdparty::zstd
)
if(APPLE)

2
rpcs3/Emu/Cell/Modules/cellGem.cpp
View file

@ -19,7 +19,7 @@
#include "Input/ps_move_tracker.h"
#ifdef HAVE_LIBEVDEV
#include "Input/evdev_gun_handler.h"
#include "Emu/Io/evdev_gun_handler.h"
#endif
#include <cmath> // for fmod

0
rpcs3/Input/evdev_gun_handler.cpp → rpcs3/Emu/Io/evdev_gun_handler.cpp
View file

0
rpcs3/Input/evdev_gun_handler.h → rpcs3/Emu/Io/evdev_gun_handler.h
View file

0
rpcs3/stb_image.cpp → rpcs3/Emu/stb_image.cpp
View file

8
rpcs3/emucore.vcxproj
View file

@ -82,6 +82,9 @@
<ClCompile Include="Emu\games_config.cpp" />
<ClCompile Include="Emu\Io\Buzz.cpp" />
<ClCompile Include="Emu\Io\camera_config.cpp" />
<ClCompile Include="Emu\Io\evdev_gun_handler.cpp">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="Emu\Io\GameTablet.cpp" />
<ClCompile Include="Emu\Io\GHLtar.cpp" />
<ClCompile Include="Emu\Io\GunCon3.cpp" />
@ -530,7 +533,7 @@
<ClCompile Include="Loader\TROPUSR.cpp" />
<ClCompile Include="Loader\TRP.cpp" />
<ClCompile Include="rpcs3_version.cpp" />
<ClCompile Include="stb_image.cpp" />
<ClCompile Include="Emu\stb_image.cpp" />
<ClCompile Include="stdafx.cpp">
<PrecompiledHeader>Create</PrecompiledHeader>
</ClCompile>
@ -574,6 +577,9 @@
<ClInclude Include="Emu\Io\camera_config.h" />
<ClInclude Include="Emu\Io\camera_handler_base.h" />
<ClInclude Include="Emu\Io\emulated_pad_config.h" />
<ClInclude Include="Emu\Io\evdev_gun_handler.h">
<ExcludedFromBuild>true</ExcludedFromBuild>
</ClInclude>
<ClInclude Include="Emu\Io\GameTablet.h" />
<ClInclude Include="Emu\Io\gem_config.h" />
<ClInclude Include="Emu\Io\GHLtar.h" />

8
rpcs3/emucore.vcxproj.filters
View file

@ -1083,7 +1083,7 @@
<ClCompile Include="stdafx.cpp">
<Filter>Emu</Filter>
</ClCompile>
<ClCompile Include="stb_image.cpp" />
<ClCompile Include="Emu\stb_image.cpp" />
<ClCompile Include="Emu\RSX\Program\FragmentProgramDecompiler.cpp">
<Filter>Emu\GPU\RSX\Program</Filter>
</ClCompile>
@ -1357,6 +1357,9 @@
<ClCompile Include="Emu\RSX\Overlays\overlay_video.cpp">
<Filter>Emu\GPU\RSX\Overlays</Filter>
</ClCompile>
<ClCompile Include="Emu\Io\evdev_gun_handler.cpp">
<Filter>Emu\Io</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="Crypto\aes.h">
@ -2725,6 +2728,9 @@
<ClInclude Include="Emu\RSX\Overlays\overlay_video.h">
<Filter>Emu\GPU\RSX\Overlays</Filter>
</ClInclude>
<ClInclude Include="Emu\Io\evdev_gun_handler.h">
<Filter>Emu\Io</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="Emu\RSX\Program\GLSLSnippets\GPUDeswizzle.glsl">

2
rpcs3/rpcs3.vcxproj
View file

@ -193,7 +193,6 @@
<ItemGroup>
<ClCompile Include="display_sleep_control.cpp" />
<ClCompile Include="Input\dualsense_pad_handler.cpp" />
<ClCompile Include="Input\evdev_gun_handler.cpp" />
<ClCompile Include="Input\gui_pad_thread.cpp" />
<ClCompile Include="Input\hid_pad_handler.cpp" />
<ClCompile Include="Input\ps_move_calibration.cpp" />
@ -920,7 +919,6 @@
<ClInclude Include="Input\ds3_pad_handler.h" />
<ClInclude Include="Input\ds4_pad_handler.h" />
<ClInclude Include="Input\dualsense_pad_handler.h" />
<ClInclude Include="Input\evdev_gun_handler.h" />
<ClInclude Include="Input\evdev_joystick_handler.h" />
<ClInclude Include="Input\gui_pad_thread.h" />
<ClInclude Include="Input\hid_pad_handler.h" />

6
rpcs3/rpcs3.vcxproj.filters
View file

@ -993,9 +993,6 @@
<ClCompile Include="QTGeneratedFiles\Release\moc_pad_motion_settings_dialog.cpp">
<Filter>Generated Files\Release</Filter>
</ClCompile>
<ClCompile Include="Input\evdev_gun_handler.cpp">
<Filter>Io\evdev</Filter>
</ClCompile>
<ClCompile Include="Input\sdl_pad_handler.cpp">
<Filter>Io\SDL</Filter>
</ClCompile>
@ -1349,9 +1346,6 @@
<ClInclude Include="rpcs3qt\pad_device_info.h">
<Filter>Gui\settings</Filter>
</ClInclude>
<ClInclude Include="Input\evdev_gun_handler.h">
<Filter>Io\evdev</Filter>
</ClInclude>
<ClInclude Include="module_verifier.hpp">
<Filter>rpcs3</Filter>
</ClInclude>

14
rpcs3/rpcs3qt/CMakeLists.txt
View file

@ -137,7 +137,6 @@ add_library(rpcs3_ui STATIC
../module_verifier.cpp
../rpcs3.cpp
../rpcs3_version.cpp
../stb_image.cpp
../stdafx.cpp
../Input/basic_keyboard_handler.cpp
@ -146,7 +145,6 @@ add_library(rpcs3_ui STATIC
../Input/ds4_pad_handler.cpp
../Input/dualsense_pad_handler.cpp
../Input/evdev_joystick_handler.cpp
../Input/evdev_gun_handler.cpp
../Input/gui_pad_thread.cpp
../Input/hid_pad_handler.cpp
../Input/keyboard_pad_handler.cpp
@ -189,20 +187,20 @@ target_compile_definitions(rpcs3_ui PRIVATE WIN32_LEAN_AND_MEAN)
target_link_libraries(rpcs3_ui
PUBLIC
rpcs3_emu
3rdparty::qt6
3rdparty::yaml-cpp
PRIVATE
rpcs3_emu
3rdparty::zlib
3rdparty::pugixml
3rdparty::discordRPC
3rdparty::hidapi
3rdparty::libusb
3rdparty::libpng
3rdparty::7zip
3rdparty::wolfssl
3rdparty::libcurl
3rdparty::opencv
3rdparty::fusion
PRIVATE
3rdparty::pugixml
3rdparty::libpng
3rdparty::7zip
3rdparty::rtmidi)

2
rpcs3/rpcs3qt/hex_validator.h
View file

@ -44,7 +44,7 @@ public:
if (!ok)
return QValidator::Invalid;
if (m_max_bits < 64)
if (m_max_bits < 64)
{
const qulonglong max_val = (qulonglong(1) << m_max_bits) - 1;
if (value > max_val)