mirrors/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-21 03:55:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'master' of https://github.com/DHrpcs3/rpcs3

Browse source
This commit is contained in:
Oil 2014-05-31 19:19:54 +04:00
commit 1705c5afb6
5 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
OpenAL/Win32/libOpenAL32.dll.a
View file

Binary file not shown.

BIN
OpenAL/Win64/libOpenAL32.dll.a
View file

Binary file not shown.

2
README.md
View file

@ -17,7 +17,7 @@ If you want to contribute please take a took at the [Coding Style](https://githu
__Windows__
* [Visual C++ Redistributable Packages for Visual Studio 2013](http://www.microsoft.com/en-us/download/details.aspx?id=40784)
* [OpenAL binaries](http://kcat.strangesoft.net/openal.html): download and copy `Win32\soft_oal.dll` to `rpcs3\bin\OpenAL32.dll`
* [OpenAL binaries](http://kcat.strangesoft.net/openal.html): download and copy `Win64\soft_oal.dll` to `rpcs3\bin\`
__Linux__
* Debian & Ubuntu: `sudo apt-get install libopenal-dev libwxgtk3.0-dev build-essential`

5
rpcs3.sln
View file

@ -131,7 +131,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "stc", "wxWidgets\build\msw\
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "wxscintilla", "wxWidgets\build\msw\wx_vc10_wxscintilla.vcxproj", "{74827EBD-93DC-5110-BA95-3F2AB029B6B0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asmjitsrc\asmjit", "asmjitsrc\asmjit.vcxproj", "{AC40FF01-426E-4838-A317-66354CEFAE88}"
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "asmjit", "asmjitsrc\asmjit.vcxproj", "{AC40FF01-426E-4838-A317-66354CEFAE88}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "asmjit", "asmjit", "{E2A982F2-4B1A-48B1-8D77-A17A589C58D7}"
EndProject
@ -460,7 +460,4 @@ Global
{74827EBD-93DC-5110-BA95-3F2AB029B6B0} = {5812E712-6213-4372-B095-9EB9BAA1F2DF}
{AC40FF01-426E-4838-A317-66354CEFAE88} = {E2A982F2-4B1A-48B1-8D77-A17A589C58D7}
EndGlobalSection
GlobalSection(Performance) = preSolution
HasPerformanceSessions = true
EndGlobalSection
EndGlobal

6
rpcs3/Emu/GS/sysutil_video.h
View file

@ -233,6 +233,7 @@ static const CellVideoOutResolution ResolutionTable[] =
{1280, 1080}, //12 - 7
{960, 1080}, //13 - 8
{960, 540}, //14 - 9
{1024,768}, //15 - 10
};
inline static u32 ResolutionIdToNum(u32 id)
@ -254,9 +255,10 @@ inline static u32 ResolutionIdToNum(u32 id)
7, //12
8, //13
9, //14
10, //15
};
return id <= 14 ? res[id] : 0;
return id <= 15 ? res[id] : 0;
}
inline static u32 ResolutionNumToId(u32 num)
@ -275,5 +277,5 @@ inline static u32 ResolutionNumToId(u32 num)
14,
};
return num <= 9 ? res[num] : 0;
return num <= 10 ? res[num] : 0;
}