ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix compilation errors of the old plugins. 

- zerospu2: include stdint.h in Windows. (VC2012+)
- CDVDolio: Remove hash_map (not used, VC2015+)
- zerogs: Fix extern and link to utilities. (VC2012+)
- zzogl: Port windows part to wx30. (VC2012+)
This commit is contained in:
Miguel A. Colón Vélez 2015-08-10 04:48:57 -04:00
parent a1e56518a5
commit 51bd9fe40e
5 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/include/Pcsx2Types.h
View File

@ -34,6 +34,8 @@
// Basic Atomic Types
// --------------------------------------------------------------------------------------
#include "stdint.h"
#if defined(_MSC_VER)
// In doubt, we keep this define for VS2010
@ -50,7 +52,6 @@ typedef unsigned __int64 u64;
#else // _MSC_VER*/
#include "stdint.h"
// Note: char does not have a default sign, unlike other types. As we actually want
// char and not signed char in pcsx2, we define s8 to char

2
plugins/CDVDolio/stdafx.h
View File

@ -52,10 +52,8 @@
#include <vector>
#include <list>
#include <map>
#include <hash_map>
using namespace std;
using namespace stdext;
extern string format(const char* fmt, ...);

2
plugins/zerogs/dx/GS.h
View File

@ -647,7 +647,7 @@ char *SysLibError(); // Gets previous error loading sysbols
void SysCloseLibrary(void *lib); // Closes Library
void SysMessage(char *fmt, ...);
extern "C" u8 memcmp_mmx(const void *dest, const void *src, int n);
extern u8 memcmp_mmx(const void *dest, const void *src, int n);
template <typename T>
class CInterfacePtr

4
plugins/zerogs/dx/Windows/zerogs.vcxproj
View File

@ -200,6 +200,10 @@
<LinkLibraryDependencies>true</LinkLibraryDependencies>
<UseLibraryDependencyInputs>false</UseLibraryDependencyInputs>
</ProjectReference>
<ProjectReference Include="..\..\..\..\common\build\Utilities\utilities.vcxproj">
<Project>{4639972e-424e-4e13-8b07-ca403c481346}</Project>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">

27
plugins/zzogl-pg/opengl/Win32/Conf.cpp
View File

@ -37,7 +37,7 @@ void SaveConfig()
WritePrivateProfileString(L"Settings", L"Antialiasing", szValue, iniFile);
wxSprintf(szValue, L"%u", conf.bilinear);
WritePrivateProfileString(L"Settings", L"Bilinear", szValue, iniFile);
wxSprintf(szValue, L"%u", conf.zz_options);
wxSprintf(szValue, L"%u", conf.zz_options._u32);
WritePrivateProfileString(L"Settings", L"ZZOptions", szValue, iniFile);
wxSprintf(szValue, L"%u", conf.hacks._u32);
WritePrivateProfileString(L"Settings", L"AdvancedOptions", szValue, iniFile);
@ -52,6 +52,7 @@ void SaveConfig()
void LoadConfig()
{
wxChar szValue[256];
unsigned long val;
const wxString iniFile(Path::Combine(s_strIniPath, L"zzogl-pg.ini"));
memset(&conf, 0, sizeof(conf));
@ -78,21 +79,29 @@ void LoadConfig()
fclose(fp);
GetPrivateProfileString(L"Settings", L"Interlace", NULL, szValue, 20, iniFile);
conf.interlace = (u8)wxStrtoul(szValue, NULL, 10);
wxString(szValue).ToULong(&val);
conf.interlace = (u8)val;
GetPrivateProfileString(L"Settings", L"Antialiasing", NULL, szValue, 20, iniFile);
conf.aa = (u8)wxStrtoul(szValue, NULL, 10);
wxString(szValue).ToULong(&val);
conf.aa = (u8)val;
GetPrivateProfileString(L"Settings", L"ZZOptions", NULL, szValue, 20, iniFile);
conf.zz_options._u32 = wxStrtoul(szValue, NULL, 10);
wxString(szValue).ToULong(&val);
conf.zz_options._u32 = val;
GetPrivateProfileString(L"Settings", L"AdvancedOptions", NULL, szValue, 20, iniFile);
conf.hacks._u32 = wxStrtoul(szValue, NULL, 10);
wxString(szValue).ToULong(&val);
conf.hacks._u32 = val;
GetPrivateProfileString(L"Settings", L"Bilinear", NULL, szValue, 20, iniFile);
conf.bilinear = (u8)wxStrtoul(szValue, NULL, 10);
wxString(szValue).ToULong(&val);
conf.bilinear = (u8)val;
GetPrivateProfileString(L"Settings", L"Width", NULL, szValue, 20, iniFile);
conf.width = wxStrtoul(szValue, NULL, 10);
wxString(szValue).ToULong(&val);
conf.width = val;
GetPrivateProfileString(L"Settings", L"Height", NULL, szValue, 20, iniFile);
conf.height = wxStrtoul(szValue, NULL, 10);
wxString(szValue).ToULong(&val);
conf.height = val;
GetPrivateProfileString(L"Settings", L"SkipDraw", NULL, szValue, 20, iniFile);
conf.SkipDraw = wxStrtoul(szValue, NULL, 10);
wxString(szValue).ToULong(&val);
conf.SkipDraw = val;
if (conf.aa < 0 || conf.aa > 4) conf.aa = 0;