From 697f78afe6bf8164457e6690f89cbb943544c837 Mon Sep 17 00:00:00 2001 From: ramapcsx2 Date: Sat, 26 Feb 2011 01:18:56 +0000 Subject: [PATCH] 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 --- common/vsprops/BaseProperties.vsprops | 2 +- pcsx2/COP0.cpp | 4 +-- pcsx2/Patch.cpp | 2 +- pcsx2/gui/AppInit.cpp | 2 +- pcsx2/gui/Panels/GameDatabasePanel.cpp | 2 -- pcsx2/gui/Panels/MemoryCardListPanel.cpp | 4 +-- pcsx2/x86/newVif_Dynarec.cpp | 1 - plugins/GSdx/GSdx_vs2008.vcproj | 2 ++ tools/GSDumpGUI/GSDumpGUI.csproj | 36 ++++++++++++++++++++++-- 9 files changed, 42 insertions(+), 13 deletions(-) diff --git a/common/vsprops/BaseProperties.vsprops b/common/vsprops/BaseProperties.vsprops index 1286c1a2bd..863d07de8e 100644 --- a/common/vsprops/BaseProperties.vsprops +++ b/common/vsprops/BaseProperties.vsprops @@ -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)" > diff --git a/pcsx2/COP0.cpp b/pcsx2/COP0.cpp index e42d7ab7fb..b381d9f767 100644 --- a/pcsx2/COP0.cpp +++ b/pcsx2/COP0.cpp @@ -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); diff --git a/pcsx2/Patch.cpp b/pcsx2/Patch.cpp index c2e9bb2783..b6fbae5a5e 100644 --- a/pcsx2/Patch.cpp +++ b/pcsx2/Patch.cpp @@ -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, diff --git a/pcsx2/gui/AppInit.cpp b/pcsx2/gui/AppInit.cpp index 7cc2b5aa98..316e8ee89b 100644 --- a/pcsx2/gui/AppInit.cpp +++ b/pcsx2/gui/AppInit.cpp @@ -99,7 +99,7 @@ void Pcsx2App::OpenProgramLog() { if( AppRpc_TryInvokeAsync( &Pcsx2App::OpenProgramLog ) ) return; - if( ConsoleLogFrame* frame = GetProgramLog() ) + if( /*ConsoleLogFrame* frame =*/ GetProgramLog() ) { //pxAssume( ); return; diff --git a/pcsx2/gui/Panels/GameDatabasePanel.cpp b/pcsx2/gui/Panels/GameDatabasePanel.cpp index 652b761b56..7adc657120 100644 --- a/pcsx2/gui/Panels/GameDatabasePanel.cpp +++ b/pcsx2/gui/Panels/GameDatabasePanel.cpp @@ -228,8 +228,6 @@ protected: GameDatabaseListView& GameDatabaseListView::SortBy( GameDataColumnId column ) { - wxArrayString::CompareFunction cmpfunc = NULL; - const bool isDescending = false; wxArrayString::iterator begin = m_GamesInView.begin(); diff --git a/pcsx2/gui/Panels/MemoryCardListPanel.cpp b/pcsx2/gui/Panels/MemoryCardListPanel.cpp index 07dc9907f8..38817bfbb2 100644 --- a/pcsx2/gui/Panels/MemoryCardListPanel.cpp +++ b/pcsx2/gui/Panels/MemoryCardListPanel.cpp @@ -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) diff --git a/pcsx2/x86/newVif_Dynarec.cpp b/pcsx2/x86/newVif_Dynarec.cpp index 1c0f8912f8..b02e9f35ff 100644 --- a/pcsx2/x86/newVif_Dynarec.cpp +++ b/pcsx2/x86/newVif_Dynarec.cpp @@ -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; diff --git a/plugins/GSdx/GSdx_vs2008.vcproj b/plugins/GSdx/GSdx_vs2008.vcproj index a4b1f394ac..551d6246f9 100644 --- a/plugins/GSdx/GSdx_vs2008.vcproj +++ b/plugins/GSdx/GSdx_vs2008.vcproj @@ -181,6 +181,7 @@ /> @@ -678,6 +679,7 @@ /> diff --git a/tools/GSDumpGUI/GSDumpGUI.csproj b/tools/GSDumpGUI/GSDumpGUI.csproj index 0b34e5ad20..65eb64b304 100644 --- a/tools/GSDumpGUI/GSDumpGUI.csproj +++ b/tools/GSDumpGUI/GSDumpGUI.csproj @@ -18,12 +18,27 @@ 3.5 + publish\ + true + Disk + false + Foreground + 7 + Days + false + false + true + 0 + 1.0.0.%2a + false + false + true true full false - bin\Debug\ + F:\backup\ps2\ DEBUG;TRACE prompt 4 @@ -33,7 +48,7 @@ pdbonly true - bin\Release\ + F:\backup\ps2\ TRACE prompt 4 @@ -114,6 +129,23 @@ + + + False + .NET Framework 3.5 SP1 Client Profile + false + + + False + .NET Framework 3.5 SP1 + true + + + False + Windows Installer 3.1 + true + +