Fix win32 build

This commit is contained in:
DH 2025-04-08 04:23:23 +03:00
parent 556b53c234
commit 2b9232e4aa
7 changed files with 13 additions and 3 deletions

View file

@ -114,7 +114,6 @@ endif()
if(MSVC)
add_compile_options(/wd4530 /utf-8) # C++ exception handler used, but unwind semantics are not enabled
add_compile_definitions(WIN32_LEAN_AND_MEAN)
endif()

View file

@ -7,6 +7,8 @@
#ifdef _WIN32
#include <windows.h>
#include <combaseapi.h>
#include <mmeapi.h>
#include <system_error>
#endif

View file

@ -4,6 +4,8 @@
#ifdef _WIN32
#include <windows.h>
#include <combaseapi.h>
#include <mmeapi.h>
#include <system_error>
#endif

View file

@ -10,6 +10,8 @@
#include "XAudio2Backend.h"
#include <windows.h>
#include <combaseapi.h>
#include <mmeapi.h>
#include <system_error>
#ifndef XAUDIO2_USE_DEFAULT_PROCESSOR

View file

@ -9,6 +9,8 @@
#include <wrl/client.h>
#include <windows.h>
#include <combaseapi.h>
#include <mmeapi.h>
#include <system_error>
#include <mmdeviceapi.h>
#include <Functiondiscoverykeys_devpkey.h>

View file

@ -149,6 +149,9 @@ target_sources(rpcs3_emu PRIVATE
Audio/Cubeb/cubeb_enumerator.cpp
)
target_compile_definitions(rpcs3_emu PUBLIC WIN32_LEAN_AND_MEAN)
if(USE_FAUDIO)
find_package(SDL3)
if(SDL3_FOUND AND SDL3_VERSION VERSION_GREATER_EQUAL 3.2.0)

View file

@ -153,7 +153,7 @@ set_target_properties(rpcs3_ui
# define WIN32_LEAN_AND_MEAN resolve the problem
# https://docs.microsoft.com/en-us/windows/win32/winsock/creating-a-basic-winsock-application
# https://docs.microsoft.com/en-us/windows/win32/winprog/using-the-windows-headers#faster-builds-with-smaller-header-files
target_compile_definitions(rpcs3_ui PRIVATE WIN32_LEAN_AND_MEAN)
target_compile_definitions(rpcs3_ui PUBLIC WIN32_LEAN_AND_MEAN NOMINMAX)
target_link_libraries(rpcs3_ui
PUBLIC
@ -170,7 +170,7 @@ if (NOT ANDROID)
if(WIN32)
add_executable(rpcs3qt-ui-legacy WIN32)
target_sources(rpcs3qt-ui-legacy PRIVATE rpcs3.rc)
target_compile_definitions(rpcs3qt-ui-legacy PRIVATE UNICODE _UNICODE)
target_compile_definitions(rpcs3qt-ui-legacy PUBLIC WIN32_LEAN_AND_MEAN NOMINMAX UNICODE _UNICODE)
elseif(APPLE)
add_executable(rpcs3qt-ui-legacy MACOSX_BUNDLE)
target_sources(rpcs3qt-ui-legacy PRIVATE rpcs3.icns update_helper.sh)