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

Merge pull request #1178 from danilaml/appveyor-llvm-dx12

Browse source 
Add llvm build to appveyor and fix wrong xaudio lib with cmake
This commit is contained in:
Raul Tambre 2015-08-13 09:31:42 +03:00
commit 07f33a3809
3 changed files with 18 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
appveyor.yml
View file

@ -1,8 +1,10 @@
version: 1.0.{build} version: 1.0.{build}
os: Visual Studio 2015 os: Visual Studio 2015
configuration: Release configuration:
# - Release
- ReleaseLLVM
platform: x64 platform: x64
clone_folder: c:\projects\rpcs3 clone_folder: c:\rpcs3
clone_depth: 1 clone_depth: 1
test: off test: off
@ -14,19 +16,21 @@ before_build:
- git submodule update --init --depth 3 asmjit minidx9 - git submodule update --init --depth 3 asmjit minidx9
# until git for win 2.5 release with commit checkout # until git for win 2.5 release with commit checkout
- git submodule update --init ffmpeg - git submodule update --init ffmpeg
- 7z x wxWidgets.7z -aos -oC:\projects\rpcs3\wxWidgets > null - 7z x wxWidgets.7z -aos -oC:\rpcs3\wxWidgets > null
- cmake -G "Visual Studio 14 Win64" - if %configuration%==Release (cmake -G "Visual Studio 14 Win64")
else (7z x llvmlibs.7z -aos -oC:\rpcs3 > null && cmake -G "Visual Studio 14 Win64" -DLLVM_DIR=C:/rpcs3/llvm_build/share/llvm/cmake)
build_script: build_script:
- cmake --build . --config Release -- /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" - cmake --build . --config Release -- /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll"
install: install:
- ps: Start-FileDownload 'https://402331b94f8e4b87ae2ef4677347f7956cf3861f.googledrive.com/host/0B6v_qtb9hkicfmt0NG0wTTRtUmF4X3VTQk5Oc2JidEVKVnUteDA1dXdrYlNsVW9kREpsSHc/wxWidgets.7z' - ps: Start-FileDownload 'https://402331b94f8e4b87ae2ef4677347f7956cf3861f.googledrive.com/host/0B6v_qtb9hkicfmt0NG0wTTRtUmF4X3VTQk5Oc2JidEVKVnUteDA1dXdrYlNsVW9kREpsSHc/wxWidgets.7z'
- set WXWIN=C:\projects\rpcs3\wxWidgets; - ps: Start-FileDownload 'https://402331b94f8e4b87ae2ef4677347f7956cf3861f.googledrive.com/host/0B6v_qtb9hkicfmt0NG0wTTRtUmF4X3VTQk5Oc2JidEVKVnUteDA1dXdrYlNsVW9kREpsSHc/llvmlibs.7z'
- set OPENALDIR=C:\projects\rpcs3\OpenAL; - set WXWIN=C:\rpcs3\wxWidgets
- set OPENALDIR=C:\rpcs3\OpenAL
- set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;C:\wxWidgets;%PATH% - set PATH=C:\Program Files (x86)\MSBuild\14.0\Bin;C:\wxWidgets;%PATH%
- set COMMIT_SHA=%APPVEYOR_REPO_COMMIT:~0,8% - set COMMIT_SHA=%APPVEYOR_REPO_COMMIT:~0,8%
artifacts: artifacts:
- path: bin - path: bin
name: rpcs3-$(COMMIT_SHA) name: rpcs3-$(configuration)-$(COMMIT_SHA)

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
{ {