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

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
This commit is contained in:
arcum42 2010-03-12 09:06:12 +00:00
parent 001a286415
commit 58c75437d4
13 changed files with 27 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/build/Utilities/Utilities.cbp
View File

@ -16,7 +16,6 @@
<Compiler> <Compiler>
<Add option="-W" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --cflags`" />
<Add option="-DPCSX2_DEBUG" /> <Add option="-DPCSX2_DEBUG" />
<Add option="-DPCSX2_DEVBUILD" /> <Add option="-DPCSX2_DEVBUILD" />
</Compiler> </Compiler>
@ -29,7 +28,6 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option createDefFile="1" /> <Option createDefFile="1" />
<Compiler> <Compiler>
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --cflags`" />
<Add option="-fdefer-pop" /> <Add option="-fdefer-pop" />
<Add option="-fcprop-registers" /> <Add option="-fcprop-registers" />
<Add option="-fif-conversion" /> <Add option="-fif-conversion" />
@ -77,7 +75,6 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option createDefFile="1" /> <Option createDefFile="1" />
<Compiler> <Compiler>
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --cflags`" />
<Add option="-fdefer-pop" /> <Add option="-fdefer-pop" />
<Add option="-fcprop-registers" /> <Add option="-fcprop-registers" />
<Add option="-fif-conversion" /> <Add option="-fif-conversion" />
@ -121,6 +118,7 @@
</Build> </Build>
<Compiler> <Compiler>
<Add option="-march=i486" /> <Add option="-march=i486" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --cflags`" />
<Add option="-Wno-format" /> <Add option="-Wno-format" />
<Add option="-Wno-unused-parameter" /> <Add option="-Wno-unused-parameter" />
<Add option="-Wno-unused-value" /> <Add option="-Wno-unused-value" />

8
common/build/x86emitter/x86emitter.cbp
View File

@ -16,7 +16,6 @@
<Compiler> <Compiler>
<Add option="-W" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --cflags`" />
<Add option="-DPCSX2_DEVBUILD" /> <Add option="-DPCSX2_DEVBUILD" />
<Add option="-DPCSX2_DEBUG" /> <Add option="-DPCSX2_DEBUG" />
</Compiler> </Compiler>
@ -29,9 +28,6 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option createDefFile="1" /> <Option createDefFile="1" />
<Compiler> <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="-fdefer-pop" />
<Add option="-fcprop-registers" /> <Add option="-fcprop-registers" />
<Add option="-fif-conversion" /> <Add option="-fif-conversion" />
@ -65,6 +61,8 @@
<Add option="-falign-loops -falign-labels" /> <Add option="-falign-loops -falign-labels" />
<Add option="-ftree-vrp" /> <Add option="-ftree-vrp" />
<Add option="-ftree-pre" /> <Add option="-ftree-pre" />
<Add option="-DPCSX2_DEVBUILD" />
<Add option="-DPCSX2_DEVEL" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />
@ -78,7 +76,6 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Option createDefFile="1" /> <Option createDefFile="1" />
<Compiler> <Compiler>
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --cflags`" />
<Add option="-fdefer-pop" /> <Add option="-fdefer-pop" />
<Add option="-fcprop-registers" /> <Add option="-fcprop-registers" />
<Add option="-fif-conversion" /> <Add option="-fif-conversion" />
@ -120,6 +117,7 @@
</Build> </Build>
<Compiler> <Compiler>
<Add option="-march=i486" /> <Add option="-march=i486" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --cflags`" />
<Add option="-Wno-format" /> <Add option="-Wno-format" />
<Add option="-Wno-unused-parameter" /> <Add option="-Wno-unused-parameter" />
<Add option="-Wno-unused-value" /> <Add option="-Wno-unused-value" />

7
common/include/Pcsx2Defs.h
View File

@ -19,12 +19,11 @@
// Indicate that this is the wx port to the plugins. // Indicate that this is the wx port to the plugins.
#define WX_PCSX2 #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__ # define __LINUX__
#endif #endif
#ifdef __CYGWIN__
# define __LINUX__
#endif #endif
#include "Pcsx2Types.h" #include "Pcsx2Types.h"

10
pcsx2/Linux/pcsx2.cbp
View File

@ -18,7 +18,6 @@
<Compiler> <Compiler>
<Add option="-W" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --cflags`" />
<Add option="-DPCSX2_DEVBUILD" /> <Add option="-DPCSX2_DEVBUILD" />
<Add option="-DPCSX2_DEBUG" /> <Add option="-DPCSX2_DEBUG" />
</Compiler> </Compiler>
@ -26,7 +25,6 @@
<Add directory="$(ProjectRootDir)/gui" /> <Add directory="$(ProjectRootDir)/gui" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <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/zlib.a" />
<Add library="$(SvnRootDir)/deps/debug/libx86emitter.a" /> <Add library="$(SvnRootDir)/deps/debug/libx86emitter.a" />
<Add library="$(SvnRootDir)/deps/debug/libUtilities.a" /> <Add library="$(SvnRootDir)/deps/debug/libUtilities.a" />
@ -41,7 +39,6 @@
<Option type="0" /> <Option type="0" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --cflags`" />
<Add option="-fdefer-pop" /> <Add option="-fdefer-pop" />
<Add option="-fcprop-registers" /> <Add option="-fcprop-registers" />
<Add option="-fif-conversion" /> <Add option="-fif-conversion" />
@ -82,7 +79,6 @@
<Add directory="$(ProjectRootDir)/gui" /> <Add directory="$(ProjectRootDir)/gui" />
</ResourceCompiler> </ResourceCompiler>
<Linker> <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/zlib.a" />
<Add library="$(SvnRootDir)/deps/devel/libx86emitter.a" /> <Add library="$(SvnRootDir)/deps/devel/libx86emitter.a" />
<Add library="$(SvnRootDir)/deps/devel/libUtilities.a" /> <Add library="$(SvnRootDir)/deps/devel/libUtilities.a" />
@ -97,7 +93,6 @@
<Option type="0" /> <Option type="0" />
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --cflags`" />
<Add option="-fdefer-pop" /> <Add option="-fdefer-pop" />
<Add option="-fcprop-registers" /> <Add option="-fcprop-registers" />
<Add option="-fif-conversion" /> <Add option="-fif-conversion" />
@ -137,7 +132,6 @@
</ResourceCompiler> </ResourceCompiler>
<Linker> <Linker>
<Add option="-s" /> <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/zlib.a" />
<Add library="$(SvnRootDir)/deps/release/libx86emitter.a" /> <Add library="$(SvnRootDir)/deps/release/libx86emitter.a" />
<Add library="$(SvnRootDir)/deps/release/libUtilities.a" /> <Add library="$(SvnRootDir)/deps/release/libUtilities.a" />
@ -151,6 +145,7 @@
</Build> </Build>
<Compiler> <Compiler>
<Add option="-march=i486" /> <Add option="-march=i486" />
<Add option="`wx-config --version=2.8 --static=no --unicode=yes --cflags`" />
<Add option="-Wno-format" /> <Add option="-Wno-format" />
<Add option="-Wno-unused-parameter" /> <Add option="-Wno-unused-parameter" />
<Add option="-Wno-unused-value" /> <Add option="-Wno-unused-value" />
@ -168,6 +163,9 @@
<Add directory="$(ProjectRootDir)/gui" /> <Add directory="$(ProjectRootDir)/gui" />
<Add directory="$(ProjectRootDir)/x86" /> <Add directory="$(ProjectRootDir)/x86" />
</Compiler> </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/PS2Edefs.h" />
<Unit filename="../../common/include/PS2Etypes.h" /> <Unit filename="../../common/include/PS2Etypes.h" />
<Unit filename="../../common/include/Pcsx2Api.h" /> <Unit filename="../../common/include/Pcsx2Api.h" />

2
pcsx2/x86/iMMI.cpp
View File

@ -54,7 +54,7 @@ REC_FUNC_DEL( PSLLW, _Rd_ );
void recPLZCW() void recPLZCW()
{ {
int regd = -1; //int regd = -1;
int regs = 0; int regs = 0;
if ( ! _Rd_ ) return; if ( ! _Rd_ ) return;

4
plugins/spu2-x/src/ConvertUTF.cpp
View File

@ -133,7 +133,7 @@ namespace Unicode
unsigned short bytesToWrite = 0; unsigned short bytesToWrite = 0;
const UTF32 byteMask = 0xBF; const UTF32 byteMask = 0xBF;
const UTF32 byteMark = 0x80; 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++; ch = *source++;
@ -378,4 +378,4 @@ namespace Unicode
Convert( src, dest ); Convert( src, dest );
return dest; return dest;
} }
} }

6
plugins/spu2-x/src/Dma.cpp
View File

@ -272,14 +272,14 @@ void V_Core::PlainDMAWrite(u16 *pMem, u32 size)
{ {
// Note: (start is inclusive, dest exclusive -- fixes DMC1 FMVs) // 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; Spdif.Info |= 4 << i;
SetIrqCall(); SetIrqCall();
} }
} }
#else #else
if( IRQEnable && (IRQA >= TSA) || (IRQA < TDA) ) if ((IRQEnable && (IRQA >= TSA)) || (IRQA < TDA))
{ {
Spdif.Info |= 4 << Index; Spdif.Info |= 4 << Index;
SetIrqCall(); SetIrqCall();
@ -356,7 +356,7 @@ void V_Core::DoDMAread(u16* pMem, u32 size)
for( int i=0; i<2; i++ ) 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; Spdif.Info |= 4 << i;
SetIrqCall(); SetIrqCall();

3
plugins/spu2-x/src/Global.h
View File

@ -45,6 +45,9 @@ namespace soundtouch
using std::string; using std::string;
using std::wstring; 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 "Pcsx2Defs.h"
#include "Pcsx2Types.h" #include "Pcsx2Types.h"

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

@ -44,7 +44,7 @@ protected:
void _InternalCallback() void _InternalCallback()
{ {
snd_pcm_sframes_t avail; snd_pcm_sframes_t avail;
int err; //int err;
avail = snd_pcm_avail_update( handle ); avail = snd_pcm_avail_update( handle );
while (avail >= period_time ) while (avail >= period_time )

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

@ -128,7 +128,7 @@ void WriteSettings()
void DisplayDialog() void DisplayDialog()
{ {
GtkWidget *dialog, *main_label; GtkWidget *dialog;
int return_value; int return_value;
GtkWidget *msg_box, *log_box, *dump_box, *main_box; GtkWidget *msg_box, *log_box, *dump_box, *main_box;

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

@ -293,7 +293,7 @@ EXPORT_C_(s32) SPU2init()
{ {
assert( regtable[0x400] == NULL ); assert( regtable[0x400] == NULL );
s32 c=0,v=0; //s32 c=0,v=0;
ReadSettings(); ReadSettings();
#ifdef SPU2_LOG #ifdef SPU2_LOG

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

@ -131,7 +131,7 @@ StereoOut32 V_Core::ReadInput()
AdmaInProgress = 0; AdmaInProgress = 0;
if(InputDataLeft >= 0x200) if(InputDataLeft >= 0x200)
{ {
u8 k=InputDataLeft>=InputDataProgress; //u8 k=InputDataLeft>=InputDataProgress;
AutoDMAReadBuffer(0); AutoDMAReadBuffer(0);

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

@ -20,7 +20,7 @@
const char *ParamNames[8]={"VOLL","VOLR","PITCH","ADSR1","ADSR2","ENVX","VOLXL","VOLXR"}; const char *ParamNames[8]={"VOLL","VOLR","PITCH","ADSR1","ADSR2","ENVX","VOLXL","VOLXR"};
const char *AddressNames[6]={"SSAH","SSAL","LSAH","LSAL","NAXH","NAXL"}; 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 ) if( level > 1 )
FileLog("[%10d] SPU2 %s mem %08x (core %d, register %s) value %04x\n", 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; 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; omem=mem=rmem & 0x7FF; //FFFF;
if (mem & 0x400) { omem^=0x400; core=1; } if (mem & 0x400) { omem^=0x400; core=1; }