From 58c75437d44deefc504ee737327cc89774cb3d94 Mon Sep 17 00:00:00 2001
From: arcum42 <arcum42@96395faa-99c1-11dd-bbfe-3dabce05a288>
Date: Fri, 12 Mar 2010 09:06:12 +0000
Subject: [PATCH] Take care of a few compiler warnings, and get rid of a bit of
 redundancy in the codeblocks projects.

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2701 96395faa-99c1-11dd-bbfe-3dabce05a288
---
 common/build/Utilities/Utilities.cbp     |  4 +---
 common/build/x86emitter/x86emitter.cbp   |  8 +++-----
 common/include/Pcsx2Defs.h               |  7 +++----
 pcsx2/Linux/pcsx2.cbp                    | 10 ++++------
 pcsx2/x86/iMMI.cpp                       |  2 +-
 plugins/spu2-x/src/ConvertUTF.cpp        |  4 ++--
 plugins/spu2-x/src/Dma.cpp               |  6 +++---
 plugins/spu2-x/src/Global.h              |  3 +++
 plugins/spu2-x/src/Linux/Alsa.cpp        |  2 +-
 plugins/spu2-x/src/Linux/ConfigDebug.cpp |  2 +-
 plugins/spu2-x/src/PS2E-spu2.cpp         |  2 +-
 plugins/spu2-x/src/ReadInput.cpp         |  2 +-
 plugins/spu2-x/src/RegLog.cpp            |  5 +++--
 13 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/common/build/Utilities/Utilities.cbp b/common/build/Utilities/Utilities.cbp
index 63c08bc143..42f4375626 100644
--- a/common/build/Utilities/Utilities.cbp
+++ b/common/build/Utilities/Utilities.cbp
@@ -16,7 +16,6 @@
 				<Compiler>
 					<Add option="-W" />
 					<Add option="-g" />
-					<Add option="`wx-config  --version=2.8 --static=no --unicode=yes --cflags`" />
 					<Add option="-DPCSX2_DEBUG" />
 					<Add option="-DPCSX2_DEVBUILD" />
 				</Compiler>
@@ -29,7 +28,6 @@
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
 				<Compiler>
-					<Add option="`wx-config  --version=2.8 --static=no --unicode=yes --cflags`" />
 					<Add option="-fdefer-pop" />
 					<Add option="-fcprop-registers" />
 					<Add option="-fif-conversion" />
@@ -77,7 +75,6 @@
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
 				<Compiler>
-					<Add option="`wx-config  --version=2.8 --static=no --unicode=yes --cflags`" />
 					<Add option="-fdefer-pop" />
 					<Add option="-fcprop-registers" />
 					<Add option="-fif-conversion" />
@@ -121,6 +118,7 @@
 		</Build>
 		<Compiler>
 			<Add option="-march=i486" />
+			<Add option="`wx-config  --version=2.8 --static=no --unicode=yes --cflags`" />
 			<Add option="-Wno-format" />
 			<Add option="-Wno-unused-parameter" />
 			<Add option="-Wno-unused-value" />
diff --git a/common/build/x86emitter/x86emitter.cbp b/common/build/x86emitter/x86emitter.cbp
index 82d1d050f7..08807950a8 100644
--- a/common/build/x86emitter/x86emitter.cbp
+++ b/common/build/x86emitter/x86emitter.cbp
@@ -16,7 +16,6 @@
 				<Compiler>
 					<Add option="-W" />
 					<Add option="-g" />
-					<Add option="`wx-config  --version=2.8 --static=no --unicode=yes --cflags`" />
 					<Add option="-DPCSX2_DEVBUILD" />
 					<Add option="-DPCSX2_DEBUG" />
 				</Compiler>
@@ -29,9 +28,6 @@
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
 				<Compiler>
-					<Add option="`wx-config  --version=2.8 --static=no --unicode=yes --cflags`" />
-					<Add option="-DPCSX2_DEVBUILD" />
-					<Add option="-DPCSX2_DEVEL" />
 					<Add option="-fdefer-pop" />
 					<Add option="-fcprop-registers" />
 					<Add option="-fif-conversion" />
@@ -65,6 +61,8 @@
 					<Add option="-falign-loops  -falign-labels" />
 					<Add option="-ftree-vrp" />
 					<Add option="-ftree-pre" />
+					<Add option="-DPCSX2_DEVBUILD" />
+					<Add option="-DPCSX2_DEVEL" />
 				</Compiler>
 				<Linker>
 					<Add option="-s" />
@@ -78,7 +76,6 @@
 				<Option compiler="gcc" />
 				<Option createDefFile="1" />
 				<Compiler>
-					<Add option="`wx-config  --version=2.8 --static=no --unicode=yes --cflags`" />
 					<Add option="-fdefer-pop" />
 					<Add option="-fcprop-registers" />
 					<Add option="-fif-conversion" />
@@ -120,6 +117,7 @@
 		</Build>
 		<Compiler>
 			<Add option="-march=i486" />
+			<Add option="`wx-config  --version=2.8 --static=no --unicode=yes --cflags`" />
 			<Add option="-Wno-format" />
 			<Add option="-Wno-unused-parameter" />
 			<Add option="-Wno-unused-value" />
diff --git a/common/include/Pcsx2Defs.h b/common/include/Pcsx2Defs.h
index d1a65cc04e..7cda47be44 100644
--- a/common/include/Pcsx2Defs.h
+++ b/common/include/Pcsx2Defs.h
@@ -19,12 +19,11 @@
 // Indicate that this is the wx port to the plugins.
 #define WX_PCSX2
 
-#if defined (__linux__) && !defined(__LINUX__)  // some distributions are lower case
+// some distributions are lower case
+#if defined (__linux__) || defined(__CYGWIN__)
+#if !defined(__LINUX__)
 #	define __LINUX__
 #endif
-
-#ifdef __CYGWIN__
-#	define __LINUX__
 #endif
 
 #include "Pcsx2Types.h"
diff --git a/pcsx2/Linux/pcsx2.cbp b/pcsx2/Linux/pcsx2.cbp
index 021d29372c..e3b99e1e30 100644
--- a/pcsx2/Linux/pcsx2.cbp
+++ b/pcsx2/Linux/pcsx2.cbp
@@ -18,7 +18,6 @@
 				<Compiler>
 					<Add option="-W" />
 					<Add option="-g" />
-					<Add option="`wx-config  --version=2.8 --static=no --unicode=yes --cflags`" />
 					<Add option="-DPCSX2_DEVBUILD" />
 					<Add option="-DPCSX2_DEBUG" />
 				</Compiler>
@@ -26,7 +25,6 @@
 					<Add directory="$(ProjectRootDir)/gui" />
 				</ResourceCompiler>
 				<Linker>
-					<Add option="`wx-config  --version=2.8 --static=no --unicode=yes --libs`" />
 					<Add library="$(SvnRootDir)/deps/debug/zlib.a" />
 					<Add library="$(SvnRootDir)/deps/debug/libx86emitter.a" />
 					<Add library="$(SvnRootDir)/deps/debug/libUtilities.a" />
@@ -41,7 +39,6 @@
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
-					<Add option="`wx-config  --version=2.8 --static=no --unicode=yes --cflags`" />
 					<Add option="-fdefer-pop" />
 					<Add option="-fcprop-registers" />
 					<Add option="-fif-conversion" />
@@ -82,7 +79,6 @@
 					<Add directory="$(ProjectRootDir)/gui" />
 				</ResourceCompiler>
 				<Linker>
-					<Add option="`wx-config  --version=2.8 --static=no --unicode=yes --libs`" />
 					<Add library="$(SvnRootDir)/deps/devel/zlib.a" />
 					<Add library="$(SvnRootDir)/deps/devel/libx86emitter.a" />
 					<Add library="$(SvnRootDir)/deps/devel/libUtilities.a" />
@@ -97,7 +93,6 @@
 				<Option type="0" />
 				<Option compiler="gcc" />
 				<Compiler>
-					<Add option="`wx-config  --version=2.8 --static=no --unicode=yes --cflags`" />
 					<Add option="-fdefer-pop" />
 					<Add option="-fcprop-registers" />
 					<Add option="-fif-conversion" />
@@ -137,7 +132,6 @@
 				</ResourceCompiler>
 				<Linker>
 					<Add option="-s" />
-					<Add option="`wx-config  --version=2.8 --static=no --unicode=yes --libs`" />
 					<Add library="$(SvnRootDir)/deps/release/zlib.a" />
 					<Add library="$(SvnRootDir)/deps/release/libx86emitter.a" />
 					<Add library="$(SvnRootDir)/deps/release/libUtilities.a" />
@@ -151,6 +145,7 @@
 		</Build>
 		<Compiler>
 			<Add option="-march=i486" />
+			<Add option="`wx-config  --version=2.8 --static=no --unicode=yes --cflags`" />
 			<Add option="-Wno-format" />
 			<Add option="-Wno-unused-parameter" />
 			<Add option="-Wno-unused-value" />
@@ -168,6 +163,9 @@
 			<Add directory="$(ProjectRootDir)/gui" />
 			<Add directory="$(ProjectRootDir)/x86" />
 		</Compiler>
+		<Linker>
+			<Add option="`wx-config  --version=2.8 --static=no --unicode=yes --libs`" />
+		</Linker>
 		<Unit filename="../../common/include/PS2Edefs.h" />
 		<Unit filename="../../common/include/PS2Etypes.h" />
 		<Unit filename="../../common/include/Pcsx2Api.h" />
diff --git a/pcsx2/x86/iMMI.cpp b/pcsx2/x86/iMMI.cpp
index 5f9bc2b866..ad0f3cea6a 100644
--- a/pcsx2/x86/iMMI.cpp
+++ b/pcsx2/x86/iMMI.cpp
@@ -54,7 +54,7 @@ REC_FUNC_DEL( PSLLW, _Rd_ );
 
 void recPLZCW()
 {
-	int regd = -1;
+	//int regd = -1;
 	int regs = 0;
 
 	if ( ! _Rd_ ) return;
diff --git a/plugins/spu2-x/src/ConvertUTF.cpp b/plugins/spu2-x/src/ConvertUTF.cpp
index 66d031607d..02a08906ae 100644
--- a/plugins/spu2-x/src/ConvertUTF.cpp
+++ b/plugins/spu2-x/src/ConvertUTF.cpp
@@ -133,7 +133,7 @@ namespace Unicode
 			unsigned short bytesToWrite = 0;
 			const UTF32 byteMask = 0xBF;
 			const UTF32 byteMark = 0x80; 
-			const UTF16* oldSource = source; /* In case we have to back up because of target overflow. */
+			//const UTF16* oldSource = source; /* In case we have to back up because of target overflow. */
 
 			ch = *source++;
 
@@ -378,4 +378,4 @@ namespace Unicode
 		Convert( src, dest );
 		return dest;
 	}
-}
\ No newline at end of file
+}
diff --git a/plugins/spu2-x/src/Dma.cpp b/plugins/spu2-x/src/Dma.cpp
index 6d02bc2591..ddf38f01a9 100644
--- a/plugins/spu2-x/src/Dma.cpp
+++ b/plugins/spu2-x/src/Dma.cpp
@@ -272,14 +272,14 @@ void V_Core::PlainDMAWrite(u16 *pMem, u32 size)
 		{
 			// Note: (start is inclusive, dest exclusive -- fixes DMC1 FMVs)
 
-			if( Cores[i].IRQEnable && (Cores[i].IRQA >= TSA) || (Cores[i].IRQA < TDA) )
+			if ((Cores[i].IRQEnable && (Cores[i].IRQA >= TSA)) || (Cores[i].IRQA < TDA))
 			{
 				Spdif.Info |= 4 << i;
 				SetIrqCall();
 			}
 		}
 #else
-		if( IRQEnable && (IRQA >= TSA) || (IRQA < TDA) )
+		if ((IRQEnable && (IRQA >= TSA)) || (IRQA < TDA))
 		{
 			Spdif.Info |= 4 << Index;
 			SetIrqCall();
@@ -356,7 +356,7 @@ void V_Core::DoDMAread(u16* pMem, u32 size)
 
 		for( int i=0; i<2; i++ )
 		{
-			if( Cores[i].IRQEnable && (Cores[i].IRQA >= TSA) || (Cores[i].IRQA < TDA) )
+			if ((Cores[i].IRQEnable && (Cores[i].IRQA >= TSA)) || (Cores[i].IRQA < TDA))
 			{
 				Spdif.Info |= 4 << i;
 				SetIrqCall();
diff --git a/plugins/spu2-x/src/Global.h b/plugins/spu2-x/src/Global.h
index 18a493544a..6f5adcb5e8 100644
--- a/plugins/spu2-x/src/Global.h
+++ b/plugins/spu2-x/src/Global.h
@@ -45,6 +45,9 @@ namespace soundtouch
 using std::string;
 using std::wstring;
 
+// This will be brought in later anyways, but if we bring it in now, it'll avoid
+// warnings about redefining __LINUX__.
+#include "Utilities/Dependencies.h"
 #include "Pcsx2Defs.h"
 #include "Pcsx2Types.h"
 
diff --git a/plugins/spu2-x/src/Linux/Alsa.cpp b/plugins/spu2-x/src/Linux/Alsa.cpp
index 1ec7a18d94..03d5cd2191 100644
--- a/plugins/spu2-x/src/Linux/Alsa.cpp
+++ b/plugins/spu2-x/src/Linux/Alsa.cpp
@@ -44,7 +44,7 @@ protected:
 	void _InternalCallback()
 	{
 		snd_pcm_sframes_t avail;
-		int err;
+		//int err;
 
 		avail = snd_pcm_avail_update( handle );
 		while (avail >= period_time )
diff --git a/plugins/spu2-x/src/Linux/ConfigDebug.cpp b/plugins/spu2-x/src/Linux/ConfigDebug.cpp
index a880086f5f..9d154d430c 100644
--- a/plugins/spu2-x/src/Linux/ConfigDebug.cpp
+++ b/plugins/spu2-x/src/Linux/ConfigDebug.cpp
@@ -128,7 +128,7 @@ void WriteSettings()
 
 void DisplayDialog()
 {
-    GtkWidget *dialog, *main_label;
+    GtkWidget *dialog;
     int return_value;
     
     GtkWidget *msg_box, *log_box, *dump_box, *main_box;
diff --git a/plugins/spu2-x/src/PS2E-spu2.cpp b/plugins/spu2-x/src/PS2E-spu2.cpp
index 9c4b89ebe0..72d6481da0 100644
--- a/plugins/spu2-x/src/PS2E-spu2.cpp
+++ b/plugins/spu2-x/src/PS2E-spu2.cpp
@@ -293,7 +293,7 @@ EXPORT_C_(s32) SPU2init()
 {
 	assert( regtable[0x400] == NULL );
 
-	s32 c=0,v=0;
+	//s32 c=0,v=0;
 	ReadSettings();
 
 #ifdef SPU2_LOG
diff --git a/plugins/spu2-x/src/ReadInput.cpp b/plugins/spu2-x/src/ReadInput.cpp
index 3b201edfc3..0d78e3611d 100644
--- a/plugins/spu2-x/src/ReadInput.cpp
+++ b/plugins/spu2-x/src/ReadInput.cpp
@@ -131,7 +131,7 @@ StereoOut32 V_Core::ReadInput()
 		AdmaInProgress = 0;
 		if(InputDataLeft >= 0x200)
 		{
-			u8 k=InputDataLeft>=InputDataProgress;
+			//u8 k=InputDataLeft>=InputDataProgress;
 
 			AutoDMAReadBuffer(0);
 
diff --git a/plugins/spu2-x/src/RegLog.cpp b/plugins/spu2-x/src/RegLog.cpp
index bc95c398f2..a0ff132f5a 100644
--- a/plugins/spu2-x/src/RegLog.cpp
+++ b/plugins/spu2-x/src/RegLog.cpp
@@ -20,7 +20,7 @@
 const char *ParamNames[8]={"VOLL","VOLR","PITCH","ADSR1","ADSR2","ENVX","VOLXL","VOLXR"};
 const char *AddressNames[6]={"SSAH","SSAL","LSAH","LSAL","NAXH","NAXL"};
 
-__forceinline void _RegLog_( const char* action, int level, char *RName, u32 mem, u32 core, u16 value ) 
+__forceinline void _RegLog_( const char* action, int level, const char *RName, u32 mem, u32 core, u16 value ) 
 {
 	if( level > 1 )
 		FileLog("[%10d] SPU2 %s mem %08x (core %d, register %s) value %04x\n",
@@ -33,7 +33,8 @@ void SPU2writeLog( const char* action, u32 rmem, u16 value )
 {
 	if( !IsDevBuild ) return;
 	
-	u32 vx=0, vc=0, core=0, omem, mem;
+	//u32 vx=0, vc=0;
+	u32 core=0, omem, mem;
 	omem=mem=rmem & 0x7FF; //FFFF;
 	if (mem & 0x400) { omem^=0x400; core=1; }