From da77ed1de39e89d6f51403d6873064c38a9cb05a Mon Sep 17 00:00:00 2001 From: aniruddh Date: Mon, 26 May 2014 17:31:07 +0530 Subject: [PATCH 1/3] Update sysutil_video.h --- rpcs3/Emu/GS/sysutil_video.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/rpcs3/Emu/GS/sysutil_video.h b/rpcs3/Emu/GS/sysutil_video.h index 3488427c25..4281737d4b 100644 --- a/rpcs3/Emu/GS/sysutil_video.h +++ b/rpcs3/Emu/GS/sysutil_video.h @@ -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; } From 3de9202533f80b75818d8a6acb7b67309fe26a56 Mon Sep 17 00:00:00 2001 From: Zangetsu Date: Mon, 26 May 2014 14:30:27 +0200 Subject: [PATCH 2/3] Correct name soft_oal.dll and fix sln --- OpenAL/Win32/libOpenAL32.dll.a | Bin 95688 -> 95688 bytes OpenAL/Win64/libOpenAL32.dll.a | Bin 93582 -> 93582 bytes rpcs3.sln | 5 +---- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/OpenAL/Win32/libOpenAL32.dll.a b/OpenAL/Win32/libOpenAL32.dll.a index 5f7352acabf82dad8b8d9a08b13517b244ef1f0f..6911f1b30800da43d9c59bdcc950271a9a292808 100644 GIT binary patch delta 27 jcmX@{n)SqM)(twc9L4!*CGq)*In5@r+f8H{r$hh%rV0v@ delta 27 jcmX@{n)SqM)(twc9R3BVd5%8DM$IO&+f8H{r$hh%o9hX` diff --git a/OpenAL/Win64/libOpenAL32.dll.a b/OpenAL/Win64/libOpenAL32.dll.a index 2e4953e83bcdf721deeeaba4f6d943d2d21255bc..7661b714af2b774ab1dcccdfaca84d9ceadf186d 100644 GIT binary patch delta 27 icmeCX&DwXHbpx9WM{#~yNql}{PBWj(c0L)#hCl$4ISFn6 delta 27 icmeCX&DwXHbpx9Whkrq8o}-VkQ8S;+c0L)#hCl#_8VH*J diff --git a/rpcs3.sln b/rpcs3.sln index 9c53b05c10..128fe05523 100644 --- a/rpcs3.sln +++ b/rpcs3.sln @@ -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 From 4f1b7bf69a3597e15631747c721e24b0526eaff9 Mon Sep 17 00:00:00 2001 From: Dante38490 Date: Mon, 26 May 2014 14:34:07 +0200 Subject: [PATCH 3/3] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9a453b09b7..98ffc9be25 100644 --- a/README.md +++ b/README.md @@ -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`