From 77b8a4447e7c329446c61a08eabb6188bac5e4d8 Mon Sep 17 00:00:00 2001
From: "Jake.Stine" <Jake.Stine@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Tue, 28 Apr 2009 14:11:38 +0000
Subject: [PATCH] wxGui branch: [linux] Added soundtouch and bzip2 projects for
 Code::Blocks, and fixed up Release mode build targets for pcsx2/zlib.

git-svn-id: http://pcsx2.googlecode.com/svn/branches/wxgui@1080 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 3rdparty/SoundTouch/SoundTouch.cbp | 83 +++++++++++++++++++++++++++++
 3rdparty/bzip2/bzip2.cbp           | 85 ++++++++++++++++++++++++++++++
 3rdparty/zlib/zlib.cbp             | 13 ++---
 pcsx2/Linux/pcsx2.cbp              | 12 ++---
 4 files changed, 181 insertions(+), 12 deletions(-)
 create mode 100644 3rdparty/SoundTouch/SoundTouch.cbp
 create mode 100644 3rdparty/bzip2/bzip2.cbp

diff --git a/3rdparty/SoundTouch/SoundTouch.cbp b/3rdparty/SoundTouch/SoundTouch.cbp
new file mode 100644
index 000000000..639232d11
--- /dev/null
+++ b/3rdparty/SoundTouch/SoundTouch.cbp
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="SoundTouch" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug">
+				<Option output="../../deps/debug/libsoundtouch-dbg" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="" />
+				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/SoundTouch/.objs/debug" />
+				<Option type="2" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Compiler>
+					<Add option="-g" />
+					<Add option="-O0" />
+				</Compiler>
+			</Target>
+			<Target title="Release">
+				<Option output="../../deps/libsoundtouch" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="" />
+				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/SoundTouch/.objs/release" />
+				<Option type="2" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Compiler>
+					<Add option="-fexpensive-optimizations" />
+					<Add option="-O3" />
+					<Add option="-W" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+				</Linker>
+			</Target>
+			<Target title="Devel">
+				<Option output="../../deps/devel/libsoundtouch-dev" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="" />
+				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/SoundTouch/.objs/devel" />
+				<Option type="2" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Compiler>
+					<Add option="-O1" />
+					<Add option="-W" />
+					<Add option="-g" />
+				</Compiler>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add option="-march=athlon-xp" />
+			<Add option="-march=prescott" />
+		</Compiler>
+		<Unit filename="AAFilter.cpp" />
+		<Unit filename="AAFilter.h" />
+		<Unit filename="BPMDetect.h" />
+		<Unit filename="FIFOSampleBuffer.cpp" />
+		<Unit filename="FIFOSampleBuffer.h" />
+		<Unit filename="FIFOSamplePipe.h" />
+		<Unit filename="FIRFilter.cpp" />
+		<Unit filename="FIRFilter.h" />
+		<Unit filename="RateTransposer.cpp" />
+		<Unit filename="RateTransposer.h" />
+		<Unit filename="STTypes.h" />
+		<Unit filename="SoundTouch.cpp" />
+		<Unit filename="SoundTouch.h" />
+		<Unit filename="TDStretch.cpp" />
+		<Unit filename="TDStretch.h" />
+		<Unit filename="WavFile.cpp" />
+		<Unit filename="WavFile.h" />
+		<Unit filename="cpu_detect.h" />
+		<Unit filename="cpu_detect_x86_gcc.cpp" />
+		<Unit filename="mmx_optimized.cpp" />
+		<Unit filename="sse_optimized.cpp" />
+		<Extensions>
+			<envvars />
+			<code_completion />
+			<lib_finder disable_auto="1" />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/3rdparty/bzip2/bzip2.cbp b/3rdparty/bzip2/bzip2.cbp
new file mode 100644
index 000000000..822d73641
--- /dev/null
+++ b/3rdparty/bzip2/bzip2.cbp
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<CodeBlocks_project_file>
+	<FileVersion major="1" minor="6" />
+	<Project>
+		<Option title="bzip2" />
+		<Option pch_mode="2" />
+		<Option compiler="gcc" />
+		<Build>
+			<Target title="Debug">
+				<Option output="../../deps/debug/libbzip2-dbg" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="" />
+				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/bzip2/.objs/debug" />
+				<Option type="2" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Compiler>
+					<Add option="-g" />
+					<Add option="-O0" />
+				</Compiler>
+			</Target>
+			<Target title="Release">
+				<Option output="../../deps/libbzip2" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="" />
+				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/bzip2/.objs/release" />
+				<Option type="2" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Compiler>
+					<Add option="-fexpensive-optimizations" />
+					<Add option="-O3" />
+					<Add option="-W" />
+				</Compiler>
+				<Linker>
+					<Add option="-s" />
+				</Linker>
+			</Target>
+			<Target title="Devel">
+				<Option output="../../deps/devel/libbzip2-dev" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="" />
+				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/bzip2/.objs/devel" />
+				<Option type="2" />
+				<Option compiler="gcc" />
+				<Option createDefFile="1" />
+				<Compiler>
+					<Add option="-O1" />
+					<Add option="-W" />
+					<Add option="-g" />
+				</Compiler>
+			</Target>
+		</Build>
+		<Compiler>
+			<Add option="-march=athlon-xp" />
+			<Add option="-march=prescott" />
+		</Compiler>
+		<Unit filename="blocksort.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="bzlib.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="bzlib.h" />
+		<Unit filename="bzlib_private.h" />
+		<Unit filename="compress.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="crctable.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="decompress.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="huffman.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Unit filename="randtable.c">
+			<Option compilerVar="CC" />
+		</Unit>
+		<Extensions>
+			<envvars />
+			<code_completion />
+			<lib_finder disable_auto="1" />
+			<debugger />
+		</Extensions>
+	</Project>
+</CodeBlocks_project_file>
diff --git a/3rdparty/zlib/zlib.cbp b/3rdparty/zlib/zlib.cbp
index 096467176..5e7d5be35 100644
--- a/3rdparty/zlib/zlib.cbp
+++ b/3rdparty/zlib/zlib.cbp
@@ -7,9 +7,9 @@
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="Debug">
-				<Option output="../../deps/zlib-dbg" prefix_auto="0" extension_auto="1" />
+				<Option output="../../deps/debug/zlib-dbg" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/zlib/.objs" />
+				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/zlib/.objs/debug" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
@@ -22,19 +22,20 @@
 			<Target title="Release">
 				<Option output="../../deps/zlib" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/zlib/.objs" />
+				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/zlib/.objs/release" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
 				<Compiler>
+					<Add option="-fexpensive-optimizations" />
+					<Add option="-O3" />
 					<Add option="-W" />
-					<Add option="-O2" />
 				</Compiler>
 			</Target>
 			<Target title="Devel">
-				<Option output="../../deps/libzlib-dev" prefix_auto="1" extension_auto="1" />
+				<Option output="../../deps/devel/zlib-dev" prefix_auto="0" extension_auto="1" />
 				<Option working_dir="" />
-				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/zlib/.objs" />
+				<Option object_output="/home/pubuntu/Documents/pcsx2-newgui/3rdparty/zlib/.objs/devel" />
 				<Option type="2" />
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
diff --git a/pcsx2/Linux/pcsx2.cbp b/pcsx2/Linux/pcsx2.cbp
index dbba8f8d7..6164343c5 100644
--- a/pcsx2/Linux/pcsx2.cbp
+++ b/pcsx2/Linux/pcsx2.cbp
@@ -11,27 +11,28 @@
 				<Option platforms="Windows;Unix;" />
 				<Option output="$(SvnRootDir)/bin/pcsx2-dbg" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="$(SvnRootDir)/bin/" />
-				<Option object_output="./.objs/Debug" />
+				<Option object_output="./.objs/debug" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
 					<Add option="-g" />
 					<Add option="`wx-config  --version=2.8 --static=no --unicode=yes --debug=yes --cflags`" />
 					<Add option="-DPCSX2_DEVBUILD" />
+					<Add option="-D_DEBUG" />
 				</Compiler>
 				<ResourceCompiler>
 					<Add directory="$(ProjectRootDir)/NewGUI" />
 				</ResourceCompiler>
 				<Linker>
 					<Add option="`wx-config  --version=2.8 --static=no --unicode=yes --debug=yes --libs`" />
-					<Add library="$(SvnRootDir)/deps/zlib-dbg.a" />
+					<Add library="$(SvnRootDir)/deps/debug/zlib-dbg.a" />
 				</Linker>
 			</Target>
 			<Target title="Devel">
 				<Option platforms="Windows;Unix;" />
 				<Option output="$(SvnRootDir)/bin/pcsx2-dev" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="$(SvnRootDir)/bin/" />
-				<Option object_output="./.objs/Devel" />
+				<Option object_output="./.objs/devel" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -46,14 +47,14 @@
 				</ResourceCompiler>
 				<Linker>
 					<Add option="`wx-config  --version=2.8 --static=no --unicode=yes --debug=yes --libs`" />
-					<Add library="$(SvnRootDir)/deps/zlib-dev.a" />
+					<Add library="$(SvnRootDir)/deps/devel/zlib-dev.a" />
 				</Linker>
 			</Target>
 			<Target title="Release">
 				<Option platforms="Windows;Unix;" />
 				<Option output="$(SvnRootDir)/bin/pcsx2" prefix_auto="1" extension_auto="1" />
 				<Option working_dir="$(SvnRootDir)/bin/" />
-				<Option object_output="./.objs/Release" />
+				<Option object_output="./.objs/release" />
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
@@ -82,7 +83,6 @@
 			<Add option="-fno-guess-branch-probability" />
 			<Add option="-fno-dse -fno-tree-dse" />
 			<Add option="-DWX_PRECOMP" />
-			<Add option="-D_DEBUG" />
 			<Add directory="$(SvnRootDir)/common/include/" />
 			<Add directory="$(SvnRootDir)/3rdparty/" />
 			<Add directory="$(ProjectRootDir)" />