From 052506785bd4532c2a6c1d7811cde68e92fe9235 Mon Sep 17 00:00:00 2001
From: arcum42 <arcum42@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Wed, 12 May 2010 11:25:30 +0000
Subject: [PATCH] Enable cpu detection in spu2-x. Link to the systems copy of
 zlib, rather then building a separate copy for pcsx2.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2986 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 cmake/SearchForStuff.cmake                | 16 ++++++++--------
 common/src/Utilities/Linux/LnxThreads.cpp |  5 ++++-
 pcsx2-codeblocks.workspace                |  3 ---
 pcsx2/Linux/pcsx2.cbp                     |  4 +---
 plugins/spu2-x/src/Linux/SPU2-X.cbp       | 10 +++++-----
 plugins/spu2-x/src/PS2E-spu2.cpp          |  3 ---
 6 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
index 7f3eb8b54e..5cdfbc5b5f 100644
--- a/cmake/SearchForStuff.cmake
+++ b/cmake/SearchForStuff.cmake
@@ -55,10 +55,10 @@ endif(wxWidgets_FOUND)
 find_package(ZLIB)
 
 # if we found zlib on the system, use it else use project one
-#if(ZLIB_FOUND)
-#	# add zlib include directories
-#	include_directories(${ZLIB_INCLUDE_DIRS})
-#else(ZLIB_FOUND)
+if(ZLIB_FOUND)
+	# add zlib include directories
+	include_directories(${ZLIB_INCLUDE_DIRS})
+else(ZLIB_FOUND)
 	# use project one
 	set(projectZLIB TRUE)
 #endif(ZLIB_FOUND)
@@ -105,10 +105,10 @@ find_package(BZip2)
 
 # if we found bzip2 on the system,
 # use it else use project one
-#if(BZIP2_FOUND)
-#	# add zlib include directories
-#	include_directories(${BZIP2_INCLUDE_DIR})
-#else(BZIP2_FOUND)
+if(BZIP2_FOUND)
+	# add zlib include directories
+	include_directories(${BZIP2_INCLUDE_DIR})
+else(BZIP2_FOUND)
 	# use project one
 	set(projectBZip2 TRUE)
 #endif(BZIP2_FOUND)
diff --git a/common/src/Utilities/Linux/LnxThreads.cpp b/common/src/Utilities/Linux/LnxThreads.cpp
index d2cb7bdb63..9d0ab2d804 100644
--- a/common/src/Utilities/Linux/LnxThreads.cpp
+++ b/common/src/Utilities/Linux/LnxThreads.cpp
@@ -16,7 +16,10 @@
 
 #include "../PrecompiledHeader.h"
 #include "PersistentThread.h"
-#include "x86emitter/tools.h"
+
+// We wont need this until we actually have this more then just stubbed out, so I'm commenting this out
+// to remove an unneeded dependency.
+//#include "x86emitter/tools.h"
 
 #if !defined(__LINUX__) && !defined(__WXMAC__)
 
diff --git a/pcsx2-codeblocks.workspace b/pcsx2-codeblocks.workspace
index 744674ebac..91c14be81d 100644
--- a/pcsx2-codeblocks.workspace
+++ b/pcsx2-codeblocks.workspace
@@ -4,14 +4,11 @@
 		<Project filename="pcsx2/Linux/pcsx2.cbp" active="1">
 			<Depends filename="common/build/x86emitter/x86emitter.cbp" />
 			<Depends filename="common/build/Utilities/Utilities.cbp" />
-			<Depends filename="3rdparty/zlib/zlib.cbp" />
 			<Depends filename="tools/bin2cpp/bin2cpp.cbp" />
 		</Project>
 		<Project filename="common/build/x86emitter/x86emitter.cbp" />
 		<Project filename="common/build/Utilities/Utilities.cbp" />
 		<Project filename="3rdparty/SoundTouch/SoundTouch.cbp" />
-		<Project filename="3rdparty/zlib/zlib.cbp" />
-		<Project filename="3rdparty/bzip2/bzip2.cbp" />
 		<Project filename="3rdparty/liba52/liba52.cbp" />
 		<Project filename="plugins/FWnull/Linux/FWnull.cbp" />
 		<Project filename="plugins/USBnull/Linux/USBnull.cbp" />
diff --git a/pcsx2/Linux/pcsx2.cbp b/pcsx2/Linux/pcsx2.cbp
index b68dd95f33..e0b089c310 100644
--- a/pcsx2/Linux/pcsx2.cbp
+++ b/pcsx2/Linux/pcsx2.cbp
@@ -25,7 +25,6 @@
 					<Add directory="$(ProjectRootDir)/gui" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="$(SvnRootDir)/deps/debug/zlib.a" />
 					<Add library="$(SvnRootDir)/deps/debug/libx86emitter.a" />
 					<Add library="$(SvnRootDir)/deps/debug/libUtilities.a" />
 				</Linker>
@@ -80,7 +79,6 @@
 					<Add directory="$(ProjectRootDir)/gui" />
 				</ResourceCompiler>
 				<Linker>
-					<Add library="$(SvnRootDir)/deps/devel/zlib.a" />
 					<Add library="$(SvnRootDir)/deps/devel/libx86emitter.a" />
 					<Add library="$(SvnRootDir)/deps/devel/libUtilities.a" />
 				</Linker>
@@ -134,7 +132,6 @@
 				</ResourceCompiler>
 				<Linker>
 					<Add option="-s" />
-					<Add library="$(SvnRootDir)/deps/release/zlib.a" />
 					<Add library="$(SvnRootDir)/deps/release/libx86emitter.a" />
 					<Add library="$(SvnRootDir)/deps/release/libUtilities.a" />
 				</Linker>
@@ -167,6 +164,7 @@
 		</Compiler>
 		<Linker>
 			<Add option="`wx-config  --version=2.8 --static=no --unicode=yes --libs`" />
+			<Add library="z" />
 		</Linker>
 		<Unit filename="../../common/include/PS2Edefs.h" />
 		<Unit filename="../../common/include/PS2Etypes.h" />
diff --git a/plugins/spu2-x/src/Linux/SPU2-X.cbp b/plugins/spu2-x/src/Linux/SPU2-X.cbp
index e84222ba50..66a0f0eb9a 100644
--- a/plugins/spu2-x/src/Linux/SPU2-X.cbp
+++ b/plugins/spu2-x/src/Linux/SPU2-X.cbp
@@ -16,14 +16,14 @@
 				</Compiler>
 				<Linker>
 					<Add library="../../../../deps/debug/libsoundtouch-dbg.a" />
-					<Add library="../../../../deps/debug/libUtilities.a" />
 					<Add library="../../../../deps/debug/libx86emitter.a" />
+					<Add library="../../../../deps/debug/libUtilities.a" />
 					<Add library="../../../../deps/debug/liba52.a" />
 				</Linker>
 			</Target>
 			<Target title="Release">
 				<Option output="../../../../bin/plugins/libspu2-x.so" prefix_auto="0" extension_auto="0" />
-				<Option object_output="obj/Debug/" />
+				<Option object_output="obj/Release/" />
 				<Option type="3" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -32,9 +32,9 @@
 				</Compiler>
 				<Linker>
 					<Add library="../../../../deps/libsoundtouch.a" />
-					<Add library="../../../../deps/debug/libUtilities.a" />
-					<Add library="../../../../deps/debug/libx86emitter.a" />
-					<Add library="../../../../deps/debug/liba52.a" />
+					<Add library="../../../../deps/release/libx86emitter.a" />
+					<Add library="../../../../deps/release/libUtilities.a" />
+					<Add library="../../../../deps/release/liba52.a" />
 				</Linker>
 			</Target>
 		</Build>
diff --git a/plugins/spu2-x/src/PS2E-spu2.cpp b/plugins/spu2-x/src/PS2E-spu2.cpp
index 72039aac9d..d90e5fe435 100644
--- a/plugins/spu2-x/src/PS2E-spu2.cpp
+++ b/plugins/spu2-x/src/PS2E-spu2.cpp
@@ -113,8 +113,6 @@ static bool cpu_detected = false;
 
 static bool CheckSSE()
 {
-// I'll worry about checking sse2 in Linux later.
-#ifndef __LINUX__
 	if( !cpu_detected )
 	{
 		cpudetectInit();
@@ -125,7 +123,6 @@ static bool CheckSSE()
 		SysMessage( "Your CPU does not support SSE2 instructions.\nThe SPU2-X plugin requires SSE2 to run." );
 		return false;
 	}
-#endif
 	return true;
 }