Patch 14294 (KrossX2);

Sio1 plugin has been enabled by default for Windows;


git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@84368 e17a0e51-4ae3-4d35-97c3-1a29b211df97

3 files changed, 5 insertions, 4 deletions

diff --git a/win32/pcsxr.vcxproj b/win32/pcsxr.vcxproj
index 9765cdae..4f4e26ab 100755
--- a/win32/pcsxr.vcxproj
+++ b/win32/pcsxr.vcxproj
@@ -67,7 +67,7 @@
       <AdditionalOptions>/Zm200  %(AdditionalOptions)</AdditionalOptions>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>../;./zlib;../libpcsxcore;./glue;./;./gui;./intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;__WIN32__;__i386__;PCSXR_VERSION="1.5";ENABLE_NLS;PACKAGE="pcsxr";inline=;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;__WIN32__;__i386__;PCSXR_VERSION="1.5";ENABLE_NLS;PACKAGE="pcsxr";inline=;ENABLE_SIO1API=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>

       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>

       <PrecompiledHeaderOutputFile>.\Debug/pcsxr.pch</PrecompiledHeaderOutputFile>

@@ -112,7 +112,7 @@
       <Optimization>MaxSpeed</Optimization>

       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>

       <AdditionalIncludeDirectories>../;./zlib;../libpcsxcore;./glue;./;./gui;./intl;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;__WIN32__;_MSC_VER_;PCSXR_VERSION="1.5";__i386__;ENABLE_NLS;PACKAGE="pcsxr";inline=__forceinline;%(PreprocessorDefinitions)</PreprocessorDefinitions>

+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;__WIN32__;_MSC_VER_;PCSXR_VERSION="1.5";__i386__;ENABLE_NLS;PACKAGE="pcsxr";inline=__forceinline;ENABLE_SIO1API=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <StringPooling>true</StringPooling>

       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

       <StructMemberAlignment>16Bytes</StructMemberAlignment>

diff --git a/win32/plugins/peopsxgl/gpuPeopsOpenGL.rc b/win32/plugins/peopsxgl/gpuPeopsOpenGL.rc
index 7799f964..9972c1d3 100755
--- a/win32/plugins/peopsxgl/gpuPeopsOpenGL.rc
+++ b/win32/plugins/peopsxgl/gpuPeopsOpenGL.rc
@@ -100,12 +100,12 @@ BEGIN
         BEGIN
             VALUE "Comments", "\0"
             VALUE "CompanyName", "\0"
-            VALUE "FileDescription", "gpuPeopsOpenGL. DLL\0"
+            VALUE "FileDescription", "gpuPeopsOpenGL.dll\0"
             VALUE "FileVersion", "1, 78, 0, 0\0"
             VALUE "InternalName", "P.E.Op.S. PSX OpenGL GPU (mod)\0"
             VALUE "LegalCopyright", "Copyright (C) 1999-2009\0"
             VALUE "LegalTrademarks", "\0"
-            VALUE "OriginalFilename", "gpuPeopsOpenGL.DLL\0"
+            VALUE "OriginalFilename", "gpuPeopsOpenGL.dll\0"
             VALUE "PrivateBuild", "\0"
             VALUE "ProductName", "gpuPeopsOpenGL Dynamic Link Library\0"
             VALUE "ProductVersion", "1, 78, 0, 0\0"
diff --git a/win32/plugins/peopsxgl/winsrc/cfg.c b/win32/plugins/peopsxgl/winsrc/cfg.c
index 46629f8f..959509fd 100755
--- a/win32/plugins/peopsxgl/winsrc/cfg.c
+++ b/win32/plugins/peopsxgl/winsrc/cfg.c
@@ -182,6 +182,7 @@ BOOL OnInitCfgDialog(HWND hW)                          // INIT CONFIG DIALOG
  if(iUseScanLines)    CheckDlgButton(hW,IDC_USESCANLINES,TRUE);
  if(iShowFPS)         CheckDlgButton(hW,IDC_SHOWFPS,TRUE);
  if(bKeepRatio)       CheckDlgButton(hW,IDC_ARATIO,TRUE);
+ if(bForceRatio43)    CheckDlgButton(hW,IDC_ARATIO43,TRUE);
  if(iBlurBuffer)      CheckDlgButton(hW,IDC_BLUR,TRUE);
  if(iNoScreenSaver)   CheckDlgButton(hW,IDC_SSAVE,TRUE);