More compilation fixes
This commit is contained in:
parent
f815f38a0c
commit
6a024eb096
|
@ -18,7 +18,10 @@
|
|||
#include "DEV9/ATA/ATA.h"
|
||||
#include "DEV9/DEV9.h"
|
||||
#include "common/FileSystem.h"
|
||||
|
||||
#ifndef PCSX2_CORE
|
||||
#include "gui/AppConfig.h"
|
||||
#endif
|
||||
|
||||
void ATA::HDD_SCE()
|
||||
{
|
||||
|
|
|
@ -41,8 +41,6 @@
|
|||
#include <string>
|
||||
#include <string_view>
|
||||
|
||||
#include <wx/textfile.h>
|
||||
|
||||
enum patch_cpu_type {
|
||||
NO_CPU,
|
||||
CPU_EE,
|
||||
|
@ -148,5 +146,3 @@ extern void PatchesVerboseReset();
|
|||
// ex. 01020304 -> 04030201
|
||||
// BitLength is length of InputNum in bits, ex. double,64 word,32 short,16
|
||||
extern u64 SwapEndian(u64 InputNum, u8 BitLength);
|
||||
|
||||
extern void inifile_process(wxTextFile& f1);
|
||||
|
|
|
@ -181,7 +181,7 @@ namespace usb_python2
|
|||
std::vector<wxString> devList;
|
||||
std::vector<wxString> devListGroups;
|
||||
|
||||
const TSTDSTRING iniPath = StringUtil::UTF8StringToWxString(Path::Combine(EmuFolders::Settings, "Python2.ini"));
|
||||
const std::wstring iniPath = StringUtil::UTF8StringToWxString(Path::Combine(EmuFolders::Settings, "Python2.ini"));
|
||||
CIniFile ciniFile;
|
||||
|
||||
if (!ciniFile.Load(iniPath))
|
||||
|
|
|
@ -108,7 +108,7 @@ namespace usb_python2
|
|||
std::vector<wxString> devList;
|
||||
std::vector<wxString> devListGroups;
|
||||
|
||||
const TSTDSTRING iniPath = StringUtil::UTF8StringToWxString(Path::Combine(EmuFolders::Settings, "Python2.ini"));
|
||||
const std::wstring iniPath = StringUtil::UTF8StringToWxString(Path::Combine(EmuFolders::Settings, "Python2.ini"));
|
||||
CIniFile ciniFile;
|
||||
|
||||
if (!ciniFile.Load(iniPath))
|
||||
|
|
|
@ -381,7 +381,7 @@ namespace usb_python2
|
|||
std::vector<std::wstring> devList;
|
||||
std::vector<std::wstring> devListGroups;
|
||||
|
||||
const TSTDSTRING iniPath = StringUtil::UTF8StringToWxString(Path::Combine(EmuFolders::Settings, "Python2.ini"));
|
||||
const std::wstring iniPath = StringUtil::UTF8StringToWxString(Path::Combine(EmuFolders::Settings, "Python2.ini"));
|
||||
CIniFile ciniFile;
|
||||
|
||||
if (!ciniFile.Load(iniPath))
|
||||
|
|
|
@ -213,7 +213,7 @@ namespace usb_python2
|
|||
auto s = reinterpret_cast<UsbPython2State*>(dev);
|
||||
|
||||
// Called when the device is initialized so just load settings here
|
||||
const TSTDSTRING iniPath = StringUtil::UTF8StringToWxString(Path::Combine(EmuFolders::Settings, "Python2.ini"));
|
||||
const std::wstring iniPath = StringUtil::UTF8StringToWxString(Path::Combine(EmuFolders::Settings, "Python2.ini"));
|
||||
CIniFile ciniFile;
|
||||
ciniFile.Load(iniPath);
|
||||
|
||||
|
|
Loading…
Reference in New Issue