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

Add NDEBUG to non-debug targets in Code::Blocks. Remove a few inlines that were causing problems with Linux. Remove a problematic hardcoded initialization of OutputModule I'd forgotten about in Spu2-x. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@2967 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2010-05-08 01:51:29 +00:00
parent a3f9d74255
commit 62c15102e4
19 changed files with 73 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
3rdparty/SoundTouch/SoundTouch.cbp vendored
View File

@ -18,22 +18,6 @@
<Add option="-O0" /> <Add option="-O0" />
</Compiler> </Compiler>
</Target> </Target>
<Target title="Release">
<Option output="../../deps/libsoundtouch" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="./.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"> <Target title="Devel">
<Option output="../../deps/devel/libsoundtouch-dev" prefix_auto="1" extension_auto="1" /> <Option output="../../deps/devel/libsoundtouch-dev" prefix_auto="1" extension_auto="1" />
<Option working_dir="" /> <Option working_dir="" />
@ -45,8 +29,26 @@
<Add option="-O1" /> <Add option="-O1" />
<Add option="-W" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-DNDEBUG" />
</Compiler> </Compiler>
</Target> </Target>
<Target title="Release">
<Option output="../../deps/libsoundtouch" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="./.objs/release" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />
<Compiler>
<Add option="-fexpensive-optimizations" />
<Add option="-O3" />
<Add option="-W" />
<Add option="-DNDEBUG" />
</Compiler>
<Linker>
<Add option="-s" />
</Linker>
</Target>
</Build> </Build>
<Compiler> <Compiler>
<Add option="-march=athlon-xp" /> <Add option="-march=athlon-xp" />

34
3rdparty/bzip2/bzip2.cbp vendored
View File

@ -18,22 +18,6 @@
<Add option="-O0" /> <Add option="-O0" />
</Compiler> </Compiler>
</Target> </Target>
<Target title="Release">
<Option output="../../deps/release/libbzip2" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="./.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"> <Target title="Devel">
<Option output="../../deps/devel/libbzip2" prefix_auto="1" extension_auto="1" /> <Option output="../../deps/devel/libbzip2" prefix_auto="1" extension_auto="1" />
<Option working_dir="" /> <Option working_dir="" />
@ -45,8 +29,26 @@
<Add option="-O1" /> <Add option="-O1" />
<Add option="-W" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-DNDEBUG" />
</Compiler> </Compiler>
</Target> </Target>
<Target title="Release">
<Option output="../../deps/release/libbzip2" prefix_auto="1" extension_auto="1" />
<Option working_dir="" />
<Option object_output="./.objs/release" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />
<Compiler>
<Add option="-fexpensive-optimizations" />
<Add option="-O3" />
<Add option="-W" />
<Add option="-DNDEBUG" />
</Compiler>
<Linker>
<Add option="-s" />
</Linker>
</Target>
</Build> </Build>
<Compiler> <Compiler>
<Add option="-march=athlon-xp" /> <Add option="-march=athlon-xp" />

26
3rdparty/zlib/zlib.cbp vendored
View File

@ -19,6 +19,19 @@
<Add option="-O0" /> <Add option="-O0" />
</Compiler> </Compiler>
</Target> </Target>
<Target title="Devel">
<Option output="../../deps/devel/zlib" prefix_auto="0" extension_auto="1" />
<Option working_dir="" />
<Option object_output="./.objs/devel" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />
<Compiler>
<Add option="-O2" />
<Add option="-W" />
<Add option="-DNDEBUG" />
</Compiler>
</Target>
<Target title="Release"> <Target title="Release">
<Option output="../../deps/release/zlib" prefix_auto="0" extension_auto="1" /> <Option output="../../deps/release/zlib" prefix_auto="0" extension_auto="1" />
<Option working_dir="" /> <Option working_dir="" />
@ -30,18 +43,7 @@
<Add option="-fexpensive-optimizations" /> <Add option="-fexpensive-optimizations" />
<Add option="-O3" /> <Add option="-O3" />
<Add option="-W" /> <Add option="-W" />
</Compiler> <Add option="-DNDEBUG" />
</Target>
<Target title="Devel">
<Option output="../../deps/devel/zlib" prefix_auto="0" extension_auto="1" />
<Option working_dir="" />
<Option object_output="./.objs/devel" />
<Option type="2" />
<Option compiler="gcc" />
<Option createDefFile="1" />
<Compiler>
<Add option="-W" />
<Add option="-O2" />
</Compiler> </Compiler>
</Target> </Target>
</Build> </Build>

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

@ -63,6 +63,7 @@
<Add option="-ftree-pre" /> <Add option="-ftree-pre" />
<Add option="-DPCSX2_DEVBUILD" /> <Add option="-DPCSX2_DEVBUILD" />
<Add option="-DPCSX2_DEVEL" /> <Add option="-DPCSX2_DEVEL" />
<Add option="-DNDEBUG" />
<Add directory="../../include" /> <Add directory="../../include" />
<Add directory="../../include/Utilities" /> <Add directory="../../include/Utilities" />
</Compiler> </Compiler>
@ -108,6 +109,7 @@
<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="-DNDEBUG" />
<Add directory="../../include" /> <Add directory="../../include" />
<Add directory="../../include/Utilities" /> <Add directory="../../include/Utilities" />
</Compiler> </Compiler>

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

@ -63,6 +63,7 @@
<Add option="-ftree-pre" /> <Add option="-ftree-pre" />
<Add option="-DPCSX2_DEVBUILD" /> <Add option="-DPCSX2_DEVBUILD" />
<Add option="-DPCSX2_DEVEL" /> <Add option="-DPCSX2_DEVEL" />
<Add option="-DNDEBUG" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />
@ -109,6 +110,7 @@
<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="-DNDEBUG" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />

4
common/include/PS2Eext.h
View File

@ -35,7 +35,7 @@
//#include "PS2Edefs.h" //#include "PS2Edefs.h"
static void __forceinline SysMessage(const char *fmt, ...); static void SysMessage(const char *fmt, ...);
static void __forceinline PluginNullConfigure(std::string desc, s32 &log); static void __forceinline PluginNullConfigure(std::string desc, s32 &log);
static void __forceinline PluginNullAbout(const char *aboutText); static void __forceinline PluginNullAbout(const char *aboutText);
@ -155,7 +155,7 @@ struct PluginConf
#ifdef __LINUX__ #ifdef __LINUX__
static void __forceinline SysMessage(const char *fmt, ...) static void SysMessage(const char *fmt, ...)
{ {
va_list list; va_list list;
char msg[512]; char msg[512];

1
plugins/CDVDnull/Linux/CDVDnull.cbp
View File

@ -26,6 +26,7 @@
<Option createStaticLib="1" /> <Option createStaticLib="1" />
<Compiler> <Compiler>
<Add option="-O2" /> <Add option="-O2" />
<Add option="-DNDEBUG" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />

5
plugins/FWnull/Linux/FWnull.cbp
View File

@ -22,6 +22,7 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-O2" /> <Add option="-O2" />
<Add option="-DNDEBUG" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />
@ -41,10 +42,10 @@
<Add option="`pkg-config gtk+-2.0 --libs`" /> <Add option="`pkg-config gtk+-2.0 --libs`" />
<Add option="-shared" /> <Add option="-shared" />
</Linker> </Linker>
<Unit filename="../FW.cpp" />
<Unit filename="../FW.h" />
<Unit filename="../Config.cpp" /> <Unit filename="../Config.cpp" />
<Unit filename="../Config.h" /> <Unit filename="../Config.h" />
<Unit filename="../FW.cpp" />
<Unit filename="../FW.h" />
<Unit filename="../ReadMe.txt" /> <Unit filename="../ReadMe.txt" />
<Extensions> <Extensions>
<code_completion /> <code_completion />

1
plugins/GSnull/Linux/GSnull.cbp
View File

@ -26,6 +26,7 @@
<Option createStaticLib="1" /> <Option createStaticLib="1" />
<Compiler> <Compiler>
<Add option="-O2" /> <Add option="-O2" />
<Add option="-DNDEBUG" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />

1
plugins/PadNull/Linux/PadNull.cbp
View File

@ -26,6 +26,7 @@
<Option createStaticLib="1" /> <Option createStaticLib="1" />
<Compiler> <Compiler>
<Add option="-O2" /> <Add option="-O2" />
<Add option="-DNDEBUG" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />

1
plugins/SPU2null/Linux/SPU2null.cbp
View File

@ -29,6 +29,7 @@
<Option createStaticLib="1" /> <Option createStaticLib="1" />
<Compiler> <Compiler>
<Add option="-O2" /> <Add option="-O2" />
<Add option="-DNDEBUG" />
<Add directory="../Linux" /> <Add directory="../Linux" />
<Add directory="../../SPU2null" /> <Add directory="../../SPU2null" />
<Add directory="../../../common/include" /> <Add directory="../../../common/include" />

1
plugins/USBnull/Linux/USBnull.cbp
View File

@ -26,6 +26,7 @@
<Option createStaticLib="1" /> <Option createStaticLib="1" />
<Compiler> <Compiler>
<Add option="-O2" /> <Add option="-O2" />
<Add option="-DNDEBUG" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />

1
plugins/dev9null/Linux/Dev9null.cbp
View File

@ -26,6 +26,7 @@
<Option createStaticLib="1" /> <Option createStaticLib="1" />
<Compiler> <Compiler>
<Add option="-O2" /> <Add option="-O2" />
<Add option="-DNDEBUG" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />

1
plugins/onepad/Linux/OnePad.cbp
View File

@ -26,6 +26,7 @@
<Option createStaticLib="1" /> <Option createStaticLib="1" />
<Compiler> <Compiler>
<Add option="-O2" /> <Add option="-O2" />
<Add option="-DNDEBUG" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />

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

@ -45,7 +45,7 @@ bool EffectsDisabled = false;
int ReverbBoost = 0; int ReverbBoost = 0;
// OUTPUT // OUTPUT
u32 OutputModule = FindOutputModuleById( PortaudioOut->GetIdent() ); u32 OutputModule = 0;
int SndOutLatencyMS = 160; int SndOutLatencyMS = 160;
bool timeStretchEnabled = true; bool timeStretchEnabled = true;
bool asyncMixingEnabled = false; bool asyncMixingEnabled = false;

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

@ -27,6 +27,7 @@
<Option compiler="gcc" /> <Option compiler="gcc" />
<Compiler> <Compiler>
<Add option="-g" /> <Add option="-g" />
<Add option="-DNDEBUG" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="../../../../deps/libsoundtouch.a" /> <Add library="../../../../deps/libsoundtouch.a" />

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

@ -57,7 +57,7 @@ __forceinline s16 * __fastcall GetMemPtr(u32 addr)
return (_spu2mem+addr); return (_spu2mem+addr);
} }
__forceinline s16 __fastcall spu2M_Read( u32 addr ) s16 __fastcall spu2M_Read( u32 addr )
{ {
return *GetMemPtr( addr & 0xfffff ); return *GetMemPtr( addr & 0xfffff );
} }
@ -1428,7 +1428,7 @@ static RegWriteHandler * const tbl_reg_writes[0x401] =
}; };
__forceinline void SPU2_FastWrite( u32 rmem, u16 value ) void SPU2_FastWrite( u32 rmem, u16 value )
{ {
tbl_reg_writes[(rmem&0x7ff)/2]( value ); tbl_reg_writes[(rmem&0x7ff)/2]( value );
} }

1
plugins/zerogs/opengl/Linux/ZeroGS.cbp
View File

@ -30,6 +30,7 @@
<Option createStaticLib="1" /> <Option createStaticLib="1" />
<Compiler> <Compiler>
<Add option="-O2" /> <Add option="-O2" />
<Add option="-DNDEBUG" />
<Add directory="../Linux" /> <Add directory="../Linux" />
<Add directory="../../opengl" /> <Add directory="../../opengl" />
<Add directory="../../../../common/include" /> <Add directory="../../../../common/include" />

2
plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp
View File

@ -34,6 +34,7 @@
<Add option="-W" /> <Add option="-W" />
<Add option="-g" /> <Add option="-g" />
<Add option="-DZEROGS_DEVBUILD" /> <Add option="-DZEROGS_DEVBUILD" />
<Add option="-DNDEBUG" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add library="../../../../../deps/release/libUtilities.a" /> <Add library="../../../../../deps/release/libUtilities.a" />
@ -50,6 +51,7 @@
<Add option="-O2" /> <Add option="-O2" />
<Add option="-W" /> <Add option="-W" />
<Add option="-DRELEASE_TO_PUBLIC" /> <Add option="-DRELEASE_TO_PUBLIC" />
<Add option="-DNDEBUG" />
</Compiler> </Compiler>
<Linker> <Linker>
<Add option="-s" /> <Add option="-s" />