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

Same changes to ZeroSPU2 & spu2-x's projects. ifdeffed out a few things in spu2-x. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1851 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2009-09-18 07:37:21 +00:00
parent 8372c48285
commit 8a1df8dbb1
8 changed files with 50 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pcsx2-codeblocks.workspace
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<CodeBlocks_workspace_file> <CodeBlocks_workspace_file>
<Workspace title="pcsx2_suite_2008 workspace"> <Workspace title="pcsx2_suite_2008 workspace">
<Project filename="pcsx2/Linux/pcsx2.cbp" active="1"> <Project filename="pcsx2/Linux/pcsx2.cbp">
<Depends filename="common/build/x86emitter/x86emitter.cbp" /> <Depends filename="common/build/x86emitter/x86emitter.cbp" />
<Depends filename="common/build/Utilities/Utilities.cbp" /> <Depends filename="common/build/Utilities/Utilities.cbp" />
<Depends filename="3rdparty/zlib/zlib.cbp" /> <Depends filename="3rdparty/zlib/zlib.cbp" />
@ -22,6 +22,11 @@
<Project filename="plugins/onepad/Linux/OnePad.cbp" /> <Project filename="plugins/onepad/Linux/OnePad.cbp" />
<Project filename="plugins/zerogs/opengl/Linux/ZeroGS.cbp" /> <Project filename="plugins/zerogs/opengl/Linux/ZeroGS.cbp" />
<Project filename="tools/bin2cpp/bin2cpp.cbp" /> <Project filename="tools/bin2cpp/bin2cpp.cbp" />
<Project filename="plugins/spu2-x/src/Linux/SPU2-X.cbp" /> <Project filename="plugins/spu2-x/src/Linux/SPU2-X.cbp" active="1">
<Depends filename="3rdparty/SoundTouch/SoundTouch.cbp" />
</Project>
<Project filename="plugins/zerospu2/Linux/ZeroSPU2.cbp">
<Depends filename="3rdparty/SoundTouch/SoundTouch.cbp" />
</Project>
</Workspace> </Workspace>
</CodeBlocks_workspace_file> </CodeBlocks_workspace_file>

13
pcsx2/gui/ConsoleLogger.cpp
View File

@ -565,6 +565,7 @@ namespace Console
// they are implemented here using a mutex lock for maximum safety. // they are implemented here using a mutex lock for maximum safety.
static void _immediate_logger( const char* src ) static void _immediate_logger( const char* src )
{ {
ScopedLock locker( immediate_log_lock ); ScopedLock locker( immediate_log_lock );
if( emuLog != NULL ) if( emuLog != NULL )
@ -574,8 +575,16 @@ namespace Console
// [TODO] make this a configurable option? Do we care? :) // [TODO] make this a configurable option? Do we care? :)
#ifdef __LINUX__ #ifdef __LINUX__
// puts does automatic newlines, which we don't want here // puts does automatic newlines, which we don't want here
//fputs( "PCSX2 > ", stdout );
/*if (strchr(src, '\n'))
{
fputs( "PCSX2 > ", stdout );
fputs( src , stdout); fputs( src , stdout);
}
else
{*/
fputs( src, stdout );
//}
#endif #endif
} }
@ -635,7 +644,7 @@ namespace Console
bool __fastcall WriteLn( const wxString& fmt ) bool __fastcall WriteLn( const wxString& fmt )
{ {
const wxString fmtline( fmt + L"\n" ); const wxString fmtline( fmt + L"\n" );
_immediate_logger( "PCSX2 > "); //_immediate_logger( "PCSX2 > ");
_immediate_logger( fmtline ); _immediate_logger( fmtline );
if( emuLog != NULL ) if( emuLog != NULL )

2
plugins/spu2-x/src/DllInterface.cpp
View File

@ -250,7 +250,9 @@ EXPORT_C_(void) SPU2close()
if( !spu2open ) return; if( !spu2open ) return;
FileLog("[%10d] SPU2 Close\n",Cycles); FileLog("[%10d] SPU2 Close\n",Cycles);
#ifndef __LINUX__
DspCloseLibrary(); DspCloseLibrary();
#endif
spdif_shutdown(); spdif_shutdown();
SndBuffer::Cleanup(); SndBuffer::Cleanup();

2
plugins/spu2-x/src/Linux/Config.cpp
View File

@ -103,6 +103,6 @@ void configure()
ReadSettings(); ReadSettings();
} }
void SysMessage(char const*, ...) void MessageBox(char const*, ...)
{ {
} }

25
plugins/spu2-x/src/Linux/SPU2-X.cbp
View File

@ -15,6 +15,9 @@
<Add option="-g" /> <Add option="-g" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" />
</Compiler> </Compiler>
<Linker>
<Add library="../../../../deps/debug/libsoundtouch-dbg.a" />
</Linker>
</Target> </Target>
<Target title="Release"> <Target title="Release">
<Option output="../../../../bin/plugins/SPU2-X.so" prefix_auto="0" extension_auto="0" /> <Option output="../../../../bin/plugins/SPU2-X.so" prefix_auto="0" extension_auto="0" />
@ -27,6 +30,7 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />
<Add library="../../../../deps/libsoundtouch.a" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
@ -51,27 +55,6 @@
<Add library="asound" /> <Add library="asound" />
<Add library="stdc++" /> <Add library="stdc++" />
</Linker> </Linker>
<Unit filename="../../../../3rdparty/SoundTouch/AAFilter.cpp" />
<Unit filename="../../../../3rdparty/SoundTouch/AAFilter.h" />
<Unit filename="../../../../3rdparty/SoundTouch/BPMDetect.h" />
<Unit filename="../../../../3rdparty/SoundTouch/FIFOSampleBuffer.cpp" />
<Unit filename="../../../../3rdparty/SoundTouch/FIFOSampleBuffer.h" />
<Unit filename="../../../../3rdparty/SoundTouch/FIFOSamplePipe.h" />
<Unit filename="../../../../3rdparty/SoundTouch/FIRFilter.cpp" />
<Unit filename="../../../../3rdparty/SoundTouch/FIRFilter.h" />
<Unit filename="../../../../3rdparty/SoundTouch/RateTransposer.cpp" />
<Unit filename="../../../../3rdparty/SoundTouch/RateTransposer.h" />
<Unit filename="../../../../3rdparty/SoundTouch/STTypes.h" />
<Unit filename="../../../../3rdparty/SoundTouch/SoundTouch.cpp" />
<Unit filename="../../../../3rdparty/SoundTouch/SoundTouch.h" />
<Unit filename="../../../../3rdparty/SoundTouch/TDStretch.cpp" />
<Unit filename="../../../../3rdparty/SoundTouch/TDStretch.h" />
<Unit filename="../../../../3rdparty/SoundTouch/WavFile.cpp" />
<Unit filename="../../../../3rdparty/SoundTouch/WavFile.h" />
<Unit filename="../../../../3rdparty/SoundTouch/cpu_detect.h" />
<Unit filename="../../../../3rdparty/SoundTouch/cpu_detect_x86_gcc.cpp" />
<Unit filename="../../../../3rdparty/SoundTouch/mmx_optimized.cpp" />
<Unit filename="../../../../3rdparty/SoundTouch/sse_optimized.cpp" />
<Unit filename="../3rdparty/liba52/a52.h" /> <Unit filename="../3rdparty/liba52/a52.h" />
<Unit filename="../3rdparty/liba52/a52_internal.h" /> <Unit filename="../3rdparty/liba52/a52_internal.h" />
<Unit filename="../3rdparty/liba52/attributes.h" /> <Unit filename="../3rdparty/liba52/attributes.h" />

2
plugins/spu2-x/src/SndOut.cpp
View File

@ -328,6 +328,7 @@ void SndBuffer::Write( const StereoOut32& Sample )
ssFreeze--; ssFreeze--;
return; return;
} }
#ifndef __LINUX__
else if( dspPluginEnabled ) else if( dspPluginEnabled )
{ {
// Convert in, send to winamp DSP, and convert out. // Convert in, send to winamp DSP, and convert out.
@ -357,6 +358,7 @@ void SndBuffer::Write( const StereoOut32& Sample )
); );
} }
} }
#endif
else else
{ {
if( !timeStretchDisabled ) if( !timeStretchDisabled )

19
plugins/spu2-x/src/Spu2.cpp
View File

@ -67,6 +67,7 @@ void SetIrqCall()
has_to_call_irq=true; has_to_call_irq=true;
} }
#ifndef __LINUX__
void SysMessage(const char *fmt, ...) void SysMessage(const char *fmt, ...)
{ {
va_list list; va_list list;
@ -79,6 +80,19 @@ void SysMessage(const char *fmt, ...)
swprintf_s(wtmp, L"%S", tmp); swprintf_s(wtmp, L"%S", tmp);
MessageBox(0, wtmp, L"SPU2-X System Message", 0); MessageBox(0, wtmp, L"SPU2-X System Message", 0);
} }
#else
void SysMessage(const char *fmt, ...)
{
va_list list;
char tmp[512];
wchar_t wtmp[512];
va_start(list,fmt);
sprintf(tmp,fmt,list);
va_end(list);
printf("%s", tmp);
}
#endif
__forceinline s16 * __fastcall GetMemPtr(u32 addr) __forceinline s16 * __fastcall GetMemPtr(u32 addr)
{ {
@ -791,7 +805,10 @@ static __forceinline u16 GetLoWord( s32& src )
return ((u16*)&src)[0]; return ((u16*)&src)[0];
} }
__forceinline void SPU2_FastWrite( u32 rmem, u16 value ) #ifndef __LINUX__
__forceinline
#endif
void SPU2_FastWrite( u32 rmem, u16 value )
{ {
u32 vx=0, vc=0, core=0, omem, mem; u32 vx=0, vc=0, core=0, omem, mem;
omem=mem=rmem & 0x7FF; //FFFF; omem=mem=rmem & 0x7FF; //FFFF;

25
plugins/zerospu2/Linux/ZeroSPU2.cbp
View File

@ -16,6 +16,9 @@
<Compiler> <Compiler>
<Add option="-g" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker>
<Add library="../../../deps/debug/libsoundtouch-dbg.a" />
</Linker>
</Target> </Target>
<Target title="Release"> <Target title="Release">
<Option output="../../../bin/plugins/libZeroSPU2.so.0.1.0" prefix_auto="0" extension_auto="0" /> <Option output="../../../bin/plugins/libZeroSPU2.so.0.1.0" prefix_auto="0" extension_auto="0" />
@ -29,6 +32,7 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />
<Add library="../../../deps/libsoundtouch.a" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
@ -53,27 +57,6 @@
<Add library="stdc++" /> <Add library="stdc++" />
<Add library="dl" /> <Add library="dl" />
</Linker> </Linker>
<Unit filename="../../../3rdparty/SoundTouch/AAFilter.cpp" />
<Unit filename="../../../3rdparty/SoundTouch/AAFilter.h" />
<Unit filename="../../../3rdparty/SoundTouch/BPMDetect.h" />
<Unit filename="../../../3rdparty/SoundTouch/FIFOSampleBuffer.cpp" />
<Unit filename="../../../3rdparty/SoundTouch/FIFOSampleBuffer.h" />
<Unit filename="../../../3rdparty/SoundTouch/FIFOSamplePipe.h" />
<Unit filename="../../../3rdparty/SoundTouch/FIRFilter.cpp" />
<Unit filename="../../../3rdparty/SoundTouch/FIRFilter.h" />
<Unit filename="../../../3rdparty/SoundTouch/RateTransposer.cpp" />
<Unit filename="../../../3rdparty/SoundTouch/RateTransposer.h" />
<Unit filename="../../../3rdparty/SoundTouch/STTypes.h" />
<Unit filename="../../../3rdparty/SoundTouch/SoundTouch.cpp" />
<Unit filename="../../../3rdparty/SoundTouch/SoundTouch.h" />
<Unit filename="../../../3rdparty/SoundTouch/TDStretch.cpp" />
<Unit filename="../../../3rdparty/SoundTouch/TDStretch.h" />
<Unit filename="../../../3rdparty/SoundTouch/WavFile.cpp" />
<Unit filename="../../../3rdparty/SoundTouch/WavFile.h" />
<Unit filename="../../../3rdparty/SoundTouch/cpu_detect.h" />
<Unit filename="../../../3rdparty/SoundTouch/cpu_detect_x86_gcc.cpp" />
<Unit filename="../../../3rdparty/SoundTouch/mmx_optimized.cpp" />
<Unit filename="../../../3rdparty/SoundTouch/sse_optimized.cpp" />
<Unit filename="Alsa.cpp" /> <Unit filename="Alsa.cpp" />
<Unit filename="Linux.cpp" /> <Unit filename="Linux.cpp" />
<Unit filename="Linux.h" /> <Unit filename="Linux.h" />