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

Update the Linux project files. A few minor changes I had sitting around. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2544 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-01-31 05:38:12 +00:00
parent 42064218ec
commit 3d131a7ea4
8 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pcsx2/CMakeLists.txt
View File

@ -302,6 +302,7 @@ set(pcsx2GuiSources
gui/Dialogs/BaseConfigurationDialog.inl
gui/Dialogs/BiosSelectorDialog.cpp
gui/Dialogs/ConfirmationDialogs.cpp
gui/Dialogs/CreateMemoryCardDialog.cpp
gui/Dialogs/FirstTimeWizard.cpp
gui/Dialogs/ImportSettingsDialog.cpp
gui/Dialogs/LogOptionsDialog.cpp

2
pcsx2/Config.h
View File

@ -617,3 +617,5 @@ TraceLogFilters& SetTraceConfig();
// Change to 1 to enable SIF wakeup hack:
#define IOP_ENABLE_SIF_HACK 0
// Change to 1 to cause all logs to be written to the console. (Very slow)
#define LOG_TO_CONSOLE 0

4
pcsx2/IopMem.cpp
View File

@ -200,7 +200,7 @@ u16 __fastcall iopMemRead16(u32 mem)
ret = psxHu16(mem);
break;
}
SIF_LOG("Sif reg read %x value %x", mem, ret);
//SIF_LOG("Sif reg read %x value %x", mem, ret);
return ret;
}
return *(const u16 *)(p + (mem & 0xffff));
@ -269,7 +269,7 @@ u32 __fastcall iopMemRead32(u32 mem)
ret = psxHu32(mem);
break;
}
SIF_LOG("Sif reg read %x value %x", mem, ret);
//SIF_LOG("Sif reg read %x value %x", mem, ret);
return ret;
}
return *(const u32 *)(p + (mem & 0xffff));

1
pcsx2/Linux/pcsx2.cbp
View File

@ -364,6 +364,7 @@
<Unit filename="../gui/Dialogs/BiosSelectorDialog.cpp" />
<Unit filename="../gui/Dialogs/ConfigurationDialog.h" />
<Unit filename="../gui/Dialogs/ConfirmationDialogs.cpp" />
<Unit filename="../gui/Dialogs/CreateMemoryCardDialog.cpp" />
<Unit filename="../gui/Dialogs/FirstTimeWizard.cpp" />
<Unit filename="../gui/Dialogs/ImportSettingsDialog.cpp" />
<Unit filename="../gui/Dialogs/LogOptionsDialog.cpp" />

1
pcsx2/Sif0.cpp
View File

@ -30,6 +30,7 @@ static __forceinline void Sif0Init()
done = false;
cycles = 0;
psxCycles = 0;
//if (sif0.end == 1) SIF_LOG("Starting with sif0.end set.");
//memzero(sif0);
//sif0.end = 0;
//sif0.data.data = 0;

13
pcsx2/Sif1.cpp
View File

@ -30,6 +30,7 @@ static __forceinline void Sif1Init()
done = false;
cycles = 0;
psxCycles = 0;
//if (sif1.end == 1) SIF_LOG("Starting with sif1.end set.");
//memzero(sif1);
//sif1.end = 0;
//sif1.data.data = 0;
@ -121,33 +122,33 @@ static __forceinline bool ProcessEETag()
switch (ptag->ID)
{
case TAG_REFE: // refe
case TAG_REFE:
SIF_LOG(" REFE %08X", ptag[1]._u32);
sif1.end = 1;
sif1dma->madr = ptag[1]._u32;
sif1dma->tadr += 16;
break;
case TAG_CNT: // cnt
case TAG_CNT:
SIF_LOG(" CNT");
sif1dma->madr = sif1dma->tadr + 16;
sif1dma->tadr = sif1dma->madr + (sif1dma->qwc << 4);
break;
case TAG_NEXT: // next
case TAG_NEXT:
SIF_LOG(" NEXT %08X", ptag[1]._u32);
sif1dma->madr = sif1dma->tadr + 16;
sif1dma->tadr = ptag[1]._u32;
break;
case TAG_REF: // ref
case TAG_REFS: // refs
case TAG_REF:
case TAG_REFS:
SIF_LOG(" REF %08X", ptag[1]._u32);
sif1dma->madr = ptag[1]._u32;
sif1dma->tadr += 16;
break;
case TAG_END: // end
case TAG_END:
SIF_LOG(" END");
sif1.end = 1;
sif1dma->madr = sif1dma->tadr + 16;

6
pcsx2/SourceLog.cpp
View File

@ -61,6 +61,9 @@ void __Log( const char* fmt, ... )
fputs( "\n", emuLog );
fflush( emuLog );
}
#if LOG_TO_CONSOLE
Console.WriteLn(tmp);
#endif
#endif
}
@ -91,6 +94,9 @@ static __forceinline void _vSourceLog( u16 protocol, u8 source, u32 cpuPc, u32 c
fputs( "\n", emuLog );
fflush( emuLog );
}
#if LOG_TO_CONSOLE
Console.WriteLn(tmp);
#endif
#endif
}

2
pcsx2/gui/i18n.cpp
View File

@ -76,7 +76,7 @@ static void i18n_DoPackageCheck( wxLanguage wxLangId, LangPackList& langs )
// database. Anything which hasn't been installed will fail to load.
//
// Because loading and hashing the entire pcsx2 translation for every possible language would
// assinine and slow, I've decided to use a two-file translation system. One file (pcsx2ident.mo)
// asinine and slow, I've decided to use a two-file translation system. One file (pcsx2ident.mo)
// is very small and simply contains the name of the language in the language native. The
// second file (pcsx2.mo) is loaded only if the user picks the language (or if it's the default
// language of the user's OS installation).