diff --git a/GPU/Directx9/helper/global.cpp b/GPU/Directx9/helper/global.cpp
index 5752b9e2c..47ed09701 100644
--- a/GPU/Directx9/helper/global.cpp
+++ b/GPU/Directx9/helper/global.cpp
@@ -77,8 +77,9 @@ bool CompilePixelShader(const char * code, LPDIRECT3DPIXELSHADER9 * pShader, LPD
ID3DXBuffer* pShaderCode;
ID3DXBuffer* pErrorMsg;
- HRESULT hr;
+ HRESULT hr = -1;
+#ifdef _XBOX
// Compile pixel shader.
hr = D3DXCompileShader( code,
(UINT)strlen( code ),
@@ -90,6 +91,7 @@ bool CompilePixelShader(const char * code, LPDIRECT3DPIXELSHADER9 * pShader, LPD
&pShaderCode,
&pErrorMsg,
pShaderTable );
+#endif
if( FAILED(hr) )
{
OutputDebugStringA((CHAR*)pErrorMsg->GetBufferPointer());
@@ -112,9 +114,10 @@ bool CompileVertexShader(const char * code, LPDIRECT3DVERTEXSHADER9 * pShader, L
ID3DXBuffer* pShaderCode;
ID3DXBuffer* pErrorMsg;
- HRESULT hr;
+ HRESULT hr = -1;
// Compile pixel shader.
+#ifdef _XBOX
hr = D3DXCompileShader( code,
(UINT)strlen( code ),
NULL,
@@ -125,6 +128,7 @@ bool CompileVertexShader(const char * code, LPDIRECT3DVERTEXSHADER9 * pShader, L
&pShaderCode,
&pErrorMsg,
pShaderTable );
+#endif
if( FAILED(hr) )
{
OutputDebugStringA((CHAR*)pErrorMsg->GetBufferPointer());
@@ -144,7 +148,10 @@ bool CompileVertexShader(const char * code, LPDIRECT3DVERTEXSHADER9 * pShader, L
void CompileShaders() {
ID3DXBuffer* pShaderCode;
ID3DXBuffer* pErrorMsg;
- HRESULT hr;
+ HRESULT hr = -1;
+
+#ifdef _XBOX
+
// Compile vertex shader.
hr = D3DXCompileShader( vscode,
(UINT)strlen( vscode ),
@@ -156,6 +163,8 @@ void CompileShaders() {
&pShaderCode,
&pErrorMsg,
NULL );
+#endif
+
if( FAILED(hr) )
{
OutputDebugStringA((CHAR*)pErrorMsg->GetBufferPointer());
@@ -168,6 +177,7 @@ void CompileShaders() {
pShaderCode->Release();
+#ifdef _XBOX
// Compile pixel shader.
hr = D3DXCompileShader( pscode,
(UINT)strlen( pscode ),
@@ -179,6 +189,8 @@ void CompileShaders() {
&pShaderCode,
&pErrorMsg,
NULL );
+#endif
+
if( FAILED(hr) )
{
OutputDebugStringA((CHAR*)pErrorMsg->GetBufferPointer());
diff --git a/README.md b/README.md
index f38b662d1..596ceb684 100644
--- a/README.md
+++ b/README.md
@@ -15,13 +15,20 @@ For the latest source code and build instructions, see [our github page][ppsspp-
What's new in 0.9.5
-------------------
-* Many, many emulation fixes including bezier/spline curve support, fixing LocoRoco and others
+* Many, many emulation fixes:
+ - bezier/spline curve support, fixing LocoRoco and others
+ - stencil clear emulation, fixing Final Fantasy IV text
* Performance improvements in some games
* Post-processing shaders like FXAA, scanlines, vignette
* More solid save states (we will try to keep them working from now on. Save states only upgrade forward,
not backward to older versions though).
* Huge debugger improvements
-* ...
+* Made Win32 menu bar translatable, and NewUI instantly changes when a new language is selected
+* Multiple UI bugs were fixed
+* Win32: Ability to store PPSSPP's config files and memory stick files in places other than the same directory
+* Android-x86 support
+* Unofficial port for modified Xbox 360 consoles
+
Basic build instructions
------------------------
diff --git a/Windows/PPSSPP.sln b/Windows/PPSSPP.sln
index cd12576b1..a16438b72 100644
--- a/Windows/PPSSPP.sln
+++ b/Windows/PPSSPP.sln
@@ -1,4 +1,4 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
+Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPSSPPWindows", "PPSSPP.vcxproj", "{567AF8DB-42C1-4D08-96CD-D70A2DFEFC6B}"
ProjectSection(ProjectDependencies) = postProject
diff --git a/Windows/PPSSPP.vcxproj b/Windows/PPSSPP.vcxproj
index 1682290d2..bfc94565f 100644
--- a/Windows/PPSSPP.vcxproj
+++ b/Windows/PPSSPP.vcxproj
@@ -127,7 +127,7 @@
false
- Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;..\ffmpeg\Windows\x86\lib\avcodec.lib;..\ffmpeg\Windows\x86\lib\avdevice.lib;..\ffmpeg\Windows\x86\lib\avformat.lib;..\ffmpeg\Windows\x86\lib\avutil.lib;..\ffmpeg\Windows\x86\lib\swresample.lib;..\ffmpeg\Windows\x86\lib\swscale.lib;comctl32.lib;xinput.lib;d3d9.lib;d3dx9d.lib;%(AdditionalDependencies)
+ Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;..\ffmpeg\Windows\x86\lib\avcodec.lib;..\ffmpeg\Windows\x86\lib\avdevice.lib;..\ffmpeg\Windows\x86\lib\avformat.lib;..\ffmpeg\Windows\x86\lib\avutil.lib;..\ffmpeg\Windows\x86\lib\swresample.lib;..\ffmpeg\Windows\x86\lib\swscale.lib;comctl32.lib;xinput.lib;d3d9.lib;%(AdditionalDependencies)
true
Windows
MachineX86
@@ -160,7 +160,7 @@
false
- Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;..\ffmpeg\Windows\x86_64\lib\avcodec.lib;..\ffmpeg\Windows\x86_64\lib\avdevice.lib;..\ffmpeg\Windows\x86_64\lib\avformat.lib;..\ffmpeg\Windows\x86_64\lib\avutil.lib;..\ffmpeg\Windows\x86_64\lib\swresample.lib;..\ffmpeg\Windows\x86_64\lib\swscale.lib;comctl32.lib;d3d9.lib;d3dx9d.lib;%(AdditionalDependencies)
+ Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;..\ffmpeg\Windows\x86_64\lib\avcodec.lib;..\ffmpeg\Windows\x86_64\lib\avdevice.lib;..\ffmpeg\Windows\x86_64\lib\avformat.lib;..\ffmpeg\Windows\x86_64\lib\avutil.lib;..\ffmpeg\Windows\x86_64\lib\swresample.lib;..\ffmpeg\Windows\x86_64\lib\swscale.lib;comctl32.lib;d3d9.lib;%(AdditionalDependencies)
true
$(OutDir)$(ProjectName).pdb
Windows
@@ -194,7 +194,7 @@
false
- Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;..\ffmpeg\Windows\x86\lib\avcodec.lib;..\ffmpeg\Windows\x86\lib\avdevice.lib;..\ffmpeg\Windows\x86\lib\avformat.lib;..\ffmpeg\Windows\x86\lib\avutil.lib;..\ffmpeg\Windows\x86\lib\swresample.lib;..\ffmpeg\Windows\x86\lib\swscale.lib;comctl32.lib;d3d9.lib;d3dx9.lib;%(AdditionalDependencies)
+ Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;..\ffmpeg\Windows\x86\lib\avcodec.lib;..\ffmpeg\Windows\x86\lib\avdevice.lib;..\ffmpeg\Windows\x86\lib\avformat.lib;..\ffmpeg\Windows\x86\lib\avutil.lib;..\ffmpeg\Windows\x86\lib\swresample.lib;..\ffmpeg\Windows\x86\lib\swscale.lib;comctl32.lib;d3d9.lib;%(AdditionalDependencies)
$(OutDir)$(TargetName)$(TargetExt)
%(AdditionalLibraryDirectories)
true
@@ -235,7 +235,7 @@
false
- Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;..\ffmpeg\Windows\x86_64\lib\avcodec.lib;..\ffmpeg\Windows\x86_64\lib\avdevice.lib;..\ffmpeg\Windows\x86_64\lib\avformat.lib;..\ffmpeg\Windows\x86_64\lib\avutil.lib;..\ffmpeg\Windows\x86_64\lib\swresample.lib;..\ffmpeg\Windows\x86_64\lib\swscale.lib;comctl32.lib;d3d9.lib;d3dx9.lib;%(AdditionalDependencies)
+ Winmm.lib;Ws2_32.lib;opengl32.lib;dsound.lib;glu32.lib;..\ffmpeg\Windows\x86_64\lib\avcodec.lib;..\ffmpeg\Windows\x86_64\lib\avdevice.lib;..\ffmpeg\Windows\x86_64\lib\avformat.lib;..\ffmpeg\Windows\x86_64\lib\avutil.lib;..\ffmpeg\Windows\x86_64\lib\swresample.lib;..\ffmpeg\Windows\x86_64\lib\swscale.lib;comctl32.lib;d3d9.lib;%(AdditionalDependencies)
%(AdditionalLibraryDirectories)
true
Windows
diff --git a/Windows/version.rc b/Windows/version.rc
index c943c7b04..58720f43a 100644
Binary files a/Windows/version.rc and b/Windows/version.rc differ
diff --git a/lang b/lang
index 3b6ae585e..76856ecfd 160000
--- a/lang
+++ b/lang
@@ -1 +1 @@
-Subproject commit 3b6ae585eac520f8c39e164fe4d0962efdaca51e
+Subproject commit 76856ecfddcc3984f7e6b0fa637bdbe2af5a4e75