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

Fix wrong XAudio lib being linked

Browse source
This commit is contained in:
Danila Malyutin 2015-08-13 00:34:54 +03:00
parent c63db8842c
commit 99156c61e4
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
appveyor.yml
View file

@ -8,6 +8,10 @@ clone_folder: c:\rpcs3
clone_depth: 1 clone_depth: 1
test: off test: off
matrix:
allow_failures:
- configuration: ReleaseLLVM
branches: branches:
except: except:
- ppu_recompiler - ppu_recompiler

7
rpcs3/CMakeLists.txt
View file

@ -97,6 +97,9 @@ ${LLVM_INCLUDE_DIRS}
"${RPCS3_SRC_DIR}/.." "${RPCS3_SRC_DIR}/.."
"${RPCS3_SRC_DIR}/../asmjit/src/asmjit" "${RPCS3_SRC_DIR}/../asmjit/src/asmjit"
) )
if(WIN32)
include_directories(BEFORE "${RPCS3_SRC_DIR}/../minidx9/Include")
endif()
if(LLVM_FOUND) if(LLVM_FOUND)
add_definitions(${LLVM_DEFINITIONS}) add_definitions(${LLVM_DEFINITIONS})
@ -145,9 +148,9 @@ endif()
if(WIN32) # I'm not sure we need all of these libs, but we link them in vs if(WIN32) # I'm not sure we need all of these libs, but we link them in vs
target_link_libraries(rpcs3 odbc32.lib odbccp32.lib comctl32.lib ws2_32.lib shlwapi.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib) target_link_libraries(rpcs3 odbc32.lib odbccp32.lib comctl32.lib ws2_32.lib shlwapi.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib)
if(LLVM_FOUND) if(LLVM_FOUND)
target_link_libraries(rpcs3 asmjit.lib xaudio2.lib ${wxWidgets_LIBRARIES} ${OPENAL_LIBRARY} avformat.lib avcodec.lib avutil.lib swresample.lib swscale.lib ${LLVM_LIBS} ${ADDITIONAL_LIBS}) target_link_libraries(rpcs3 asmjit.lib ${wxWidgets_LIBRARIES} ${OPENAL_LIBRARY} avformat.lib avcodec.lib avutil.lib swresample.lib swscale.lib ${LLVM_LIBS} ${ADDITIONAL_LIBS})
else() else()
target_link_libraries(rpcs3 asmjit.lib xaudio2.lib ${wxWidgets_LIBRARIES} ${OPENAL_LIBRARY} avformat.lib avcodec.lib avutil.lib swresample.lib swscale.lib ${ADDITIONAL_LIBS}) target_link_libraries(rpcs3 asmjit.lib ${wxWidgets_LIBRARIES} ${OPENAL_LIBRARY} avformat.lib avcodec.lib avutil.lib swresample.lib swscale.lib ${ADDITIONAL_LIBS})
endif() endif()
else() else()
if(LLVM_FOUND) if(LLVM_FOUND)

3
rpcs3/Emu/Audio/XAudio2/XAudio2Thread.h
View file

@ -2,8 +2,9 @@
#include "Emu/Audio/AudioThread.h" #include "Emu/Audio/AudioThread.h"
#if defined (_WIN32) #if defined (_WIN32)
#define _WIN32_WINNT 0x0601 // This is to be sure that correct (2.7) header is included
#include "XAudio2.h" // XAudio2 2.8 available only on Win8+, used XAudio2 2.7 from dxsdk #include "XAudio2.h" // XAudio2 2.8 available only on Win8+, used XAudio2 2.7 from dxsdk
#undef _WIN32_WINNT
class XAudio2Thread : public AudioThread class XAudio2Thread : public AudioThread
{ {