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

Get spu2-x working in Linux again. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2677 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-03-06 06:06:45 +00:00
parent b840fb9d7c
commit 39a628ab9a
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pcsx2-codeblocks.workspace
View File

@ -23,6 +23,8 @@
<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">
<Depends filename="common/build/x86emitter/x86emitter.cbp" />
<Depends filename="common/build/Utilities/Utilities.cbp" />
<Depends filename="3rdparty/SoundTouch/SoundTouch.cbp" /> <Depends filename="3rdparty/SoundTouch/SoundTouch.cbp" />
</Project> </Project>
<Project filename="plugins/zerospu2/Linux/ZeroSPU2.cbp"> <Project filename="plugins/zerospu2/Linux/ZeroSPU2.cbp">

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

@ -7,7 +7,7 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Build> <Build>
<Target title="Debug"> <Target title="Debug">
<Option output="../../../../bin/plugins/SPU2-X.so" prefix_auto="0" extension_auto="0" /> <Option output="../../../../bin/plugins/libspu2-xd.so" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/Debug/" /> <Option object_output="obj/Debug/" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="gcc" />
@ -16,19 +16,22 @@
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="../../../../deps/debug/libsoundtouch-dbg.a" /> <Add library="../../../../deps/debug/libsoundtouch-dbg.a" />
<Add library="../../../../deps/debug/libUtilities.a" />
<Add library="../../../../deps/debug/libx86emitter.a" />
</Linker> </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/libspu2-x.so" prefix_auto="0" extension_auto="0" />
<Option object_output="obj/Release/" /> <Option object_output="obj/Debug/" />
<Option type="3" /> <Option type="3" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-O2" /> <Add option="-g" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-s" />
<Add library="../../../../deps/libsoundtouch.a" /> <Add library="../../../../deps/libsoundtouch.a" />
<Add library="../../../../deps/debug/libUtilities.a" />
<Add library="../../../../deps/debug/libx86emitter.a" />
</Linker> </Linker>
</Target> </Target>
</Build> </Build>
@ -48,6 +51,9 @@
<Add directory="../../../../3rdparty/SoundTouch" /> <Add directory="../../../../3rdparty/SoundTouch" />
<Add directory="../../../../3rdparty" /> <Add directory="../../../../3rdparty" />
<Add directory="../../../../common/src/x86emitter" /> <Add directory="../../../../common/src/x86emitter" />
<Add directory="../../../../common/include/Utilities" />
<Add directory="../../../../common/src" />
<Add directory="../../../../common/src/Utilities" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --libs`" /> <Add option="`wx-config --version=2.8 --static=no --unicode=yes --libs`" />

5
plugins/spu2-x/src/PS2E-spu2.cpp
View File

@ -14,15 +14,13 @@
* You should have received a copy of the GNU Lesser General Public License * You should have received a copy of the GNU Lesser General Public License
* along with SPU2-X. If not, see <http://www.gnu.org/licenses/>. * along with SPU2-X. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "Global.h" #include "Global.h"
#include "PS2E-spu2.h" #include "PS2E-spu2.h"
#include "Dma.h" #include "Dma.h"
#include "Dialogs.h" #include "Dialogs.h"
#ifndef __LINUX__
#include "x86emitter/tools.h" #include "x86emitter/tools.h"
#endif
#ifdef _MSC_VER #ifdef _MSC_VER
# include "svnrev.h" # include "svnrev.h"
@ -119,7 +117,6 @@ static bool CheckSSE()
cpudetectInit(); cpudetectInit();
cpu_detected = true; cpu_detected = true;
} }
if( !x86caps.hasStreamingSIMDExtensions || !x86caps.hasStreamingSIMD2Extensions ) if( !x86caps.hasStreamingSIMDExtensions || !x86caps.hasStreamingSIMD2Extensions )
{ {
SysMessage( "Your CPU does not support SSE2 instructions.\nThe SPU2-X plugin requires SSE2 to run." ); SysMessage( "Your CPU does not support SSE2 instructions.\nThe SPU2-X plugin requires SSE2 to run." );