mirror of https://github.com/PCSX2/pcsx2.git
Made 2 spamming logs go to DbgCon and fixed a few compiler warnings.
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4364 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
ramapcsx2
parent
3d20bb48a8
commit
697f78afe6
|
|
@ -3,7 +3,7 @@
|
|||
ProjectType="Visual C++"
|
||||
Version="8.00"
|
||||
Name="PcsxBaseProperties"
|
||||
OutputDirectory="$(SolutionDir)\bin\$(PcsxSubsection)"
|
||||
OutputDirectory="G:\PCSX2\$(PcsxSubsection)"
|
||||
IntermediateDirectory="$(PlatformName)\$(ConfigurationName)"
|
||||
DeleteExtensionsOnClean="*.bsc;*.idb;*.sbr;*.res;*.pch;*.pdb;*.obj;*.tlb;*.tli;*.tlh;*.tmp;*.rsp;*.pgc;*.pgd;*.meta;$(TargetPath)"
|
||||
>
|
||||
|
|
|
|||
|
|
@ -232,7 +232,7 @@ void MapTLB(int i)
|
|||
u32 mask, addr;
|
||||
u32 saddr, eaddr;
|
||||
|
||||
DevCon.WriteLn("MAP TLB %d: 0x%08X-> [0x%08X 0x%08X] S=0x%08X G=%d ASID=%d Mask=0x%03X EntryLo0 PFN=%x EntryLo0 Cache=%x EntryLo1 PFN=%x EntryLo1 Cache=%x VPN2=%x",
|
||||
DbgCon.WriteLn("MAP TLB %d: 0x%08X-> [0x%08X 0x%08X] S=0x%08X G=%d ASID=%d Mask=0x%03X EntryLo0 PFN=%x EntryLo0 Cache=%x EntryLo1 PFN=%x EntryLo1 Cache=%x VPN2=%x",
|
||||
i, tlb[i].VPN2, tlb[i].PFN0, tlb[i].PFN1, tlb[i].S, tlb[i].G, tlb[i].ASID, tlb[i].Mask, tlb[i].EntryLo0 >> 6, (tlb[i].EntryLo0 & 0x38) >> 3, tlb[i].EntryLo1 >> 6, (tlb[i].EntryLo1 & 0x38) >> 3, tlb[i].VPN2);
|
||||
|
||||
if (tlb[i].S)
|
||||
|
|
@ -350,7 +350,7 @@ void TLBWI() {
|
|||
|
||||
//if (j > 48) return;
|
||||
|
||||
DevCon.Warning("COP0_TLBWI %d:%x,%x,%x,%x\n",
|
||||
DbgCon.Warning("COP0_TLBWI %d:%x,%x,%x,%x\n",
|
||||
cpuRegs.CP0.n.Index, cpuRegs.CP0.n.PageMask, cpuRegs.CP0.n.EntryHi,
|
||||
cpuRegs.CP0.n.EntryLo0, cpuRegs.CP0.n.EntryLo1);
|
||||
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ void inifile_command(bool isCheat, const wxString& cmd)
|
|||
// would make more sense... --air
|
||||
if (set.rvalue.IsEmpty()) set.rvalue = set.lvalue;
|
||||
|
||||
int code = PatchTableExecute(set, isCheat ? commands_cheat : commands_patch);
|
||||
/*int code = */PatchTableExecute(set, isCheat ? commands_cheat : commands_patch);
|
||||
}
|
||||
|
||||
// This routine receives a string containing patches, trims it,
|
||||
|
|
|
|||
|
|
@ -99,7 +99,7 @@ void Pcsx2App::OpenProgramLog()
|
|||
{
|
||||
if( AppRpc_TryInvokeAsync( &Pcsx2App::OpenProgramLog ) ) return;
|
||||
|
||||
if( ConsoleLogFrame* frame = GetProgramLog() )
|
||||
if( /*ConsoleLogFrame* frame =*/ GetProgramLog() )
|
||||
{
|
||||
//pxAssume( );
|
||||
return;
|
||||
|
|
|
|||
|
|
@ -228,8 +228,6 @@ protected:
|
|||
|
||||
GameDatabaseListView& GameDatabaseListView::SortBy( GameDataColumnId column )
|
||||
{
|
||||
wxArrayString::CompareFunction cmpfunc = NULL;
|
||||
|
||||
const bool isDescending = false;
|
||||
|
||||
wxArrayString::iterator begin = m_GamesInView.begin();
|
||||
|
|
|
|||
|
|
@ -189,8 +189,6 @@ void Panels::BaseMcdListPanel::Apply()
|
|||
{
|
||||
// Save column widths to the configuration file. Since these are used *only* by this
|
||||
// dialog, we use a direct local ini save approach, instead of going through g_conf.
|
||||
uint colcnt = m_listview->GetColumnCount();
|
||||
|
||||
if (m_listview)
|
||||
{
|
||||
IniSaver saver;
|
||||
|
|
@ -660,7 +658,7 @@ void Panels::MemoryCardListPanel_Simple::OnListDrag(wxListEvent& evt)
|
|||
|
||||
wxDropSource dragSource( m_listview );
|
||||
dragSource.SetData( my_data );
|
||||
wxDragResult result = dragSource.DoDragDrop( wxDrag_AllowMove );
|
||||
/*wxDragResult result = */dragSource.DoDragDrop( wxDrag_AllowMove );
|
||||
}
|
||||
|
||||
void Panels::MemoryCardListPanel_Simple::OnListSelectionChanged(wxListEvent& evt)
|
||||
|
|
|
|||
|
|
@ -209,7 +209,6 @@ void VifUnpackSSE_Dynarec::CompileRoutine() {
|
|||
|
||||
_vifT static __fi u8* dVifsetVUptr(uint cl, uint wl, bool isFill) {
|
||||
vifStruct& vif = GetVifX;
|
||||
VIFregisters& vifRegs = vifXRegs;
|
||||
const VURegs& VU = vuRegs[idx];
|
||||
const uint vuMemLimit = idx ? 0x4000 : 0x1000;
|
||||
|
||||
|
|
|
|||
|
|
@ -181,6 +181,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
OutputFile="G:\PCSX2\plugins\$(ProjectName)-$(SSEtype).dll"
|
||||
AdditionalLibraryDirectories=""
|
||||
ModuleDefinitionFile=".\GSdx.def"
|
||||
/>
|
||||
|
|
@ -678,6 +679,7 @@
|
|||
/>
|
||||
<Tool
|
||||
Name="VCLinkerTool"
|
||||
OutputFile="G:\PCSX2\plugins\$(ProjectName)-$(SSEtype).dll"
|
||||
AdditionalLibraryDirectories=""
|
||||
ModuleDefinitionFile=".\GSdx.def"
|
||||
/>
|
||||
|
|
|
|||
|
|
@ -18,12 +18,27 @@
|
|||
<UpgradeBackupLocation>
|
||||
</UpgradeBackupLocation>
|
||||
<OldToolsVersion>3.5</OldToolsVersion>
|
||||
<PublishUrl>publish\</PublishUrl>
|
||||
<Install>true</Install>
|
||||
<InstallFrom>Disk</InstallFrom>
|
||||
<UpdateEnabled>false</UpdateEnabled>
|
||||
<UpdateMode>Foreground</UpdateMode>
|
||||
<UpdateInterval>7</UpdateInterval>
|
||||
<UpdateIntervalUnits>Days</UpdateIntervalUnits>
|
||||
<UpdatePeriodically>false</UpdatePeriodically>
|
||||
<UpdateRequired>false</UpdateRequired>
|
||||
<MapFileExtensions>true</MapFileExtensions>
|
||||
<ApplicationRevision>0</ApplicationRevision>
|
||||
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
|
||||
<IsWebBootstrapper>false</IsWebBootstrapper>
|
||||
<UseApplicationTrust>false</UseApplicationTrust>
|
||||
<BootstrapperEnabled>true</BootstrapperEnabled>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||
<DebugSymbols>true</DebugSymbols>
|
||||
<DebugType>full</DebugType>
|
||||
<Optimize>false</Optimize>
|
||||
<OutputPath>bin\Debug\</OutputPath>
|
||||
<OutputPath>F:\backup\ps2\</OutputPath>
|
||||
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
|
|
@ -33,7 +48,7 @@
|
|||
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||
<DebugType>pdbonly</DebugType>
|
||||
<Optimize>true</Optimize>
|
||||
<OutputPath>bin\Release\</OutputPath>
|
||||
<OutputPath>F:\backup\ps2\</OutputPath>
|
||||
<DefineConstants>TRACE</DefineConstants>
|
||||
<ErrorReport>prompt</ErrorReport>
|
||||
<WarningLevel>4</WarningLevel>
|
||||
|
|
@ -114,6 +129,23 @@
|
|||
<ItemGroup>
|
||||
<None Include="Resources\AppIcon.ico" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Client.3.5">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
|
||||
<Install>false</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>.NET Framework 3.5 SP1</ProductName>
|
||||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
<BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
|
||||
<Visible>False</Visible>
|
||||
<ProductName>Windows Installer 3.1</ProductName>
|
||||
<Install>true</Install>
|
||||
</BootstrapperPackage>
|
||||
</ItemGroup>
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
|
||||
Other similar extension points exist, see Microsoft.Common.targets.
|
||||
|
|
|
|||
Loading…
Reference in New Issue