mirror of https://github.com/PCSX2/pcsx2.git
Darned fungly header file dependencies, broke compilation in dev/release builds. >_<
git-svn-id: http://pcsx2.googlecode.com/svn/trunk@1092 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
parent
9513be5476
commit
3af9acc01d
|
@ -158,3 +158,18 @@ static __forceinline u32 timeGetTime()
|
||||||
# define __releaseinline __forceinline
|
# define __releaseinline __forceinline
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
//////////////////////////////////////////////////////////////////////////////////////////
|
||||||
|
// Dev / Debug conditionals --
|
||||||
|
// Consts for using if() statements instead of uglier #ifdef macros.
|
||||||
|
|
||||||
|
#ifdef PCSX2_DEVBUILD
|
||||||
|
static const bool IsDevBuild = true;
|
||||||
|
#else
|
||||||
|
static const bool IsDevBuild = false;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef _DEBUG
|
||||||
|
static const bool IsDebugBuild = true;
|
||||||
|
#else
|
||||||
|
static const bool IsDebugBuild = false;
|
||||||
|
#endif
|
||||||
|
|
|
@ -210,35 +210,24 @@ using Console::Color_Cyan;
|
||||||
using Console::Color_Yellow;
|
using Console::Color_Yellow;
|
||||||
using Console::Color_White;
|
using Console::Color_White;
|
||||||
|
|
||||||
//////////////////////////////////////////////////////////////
|
|
||||||
|
//////////////////////////////////////////////////////////////////////////////////////////
|
||||||
// Dev / Debug conditionals --
|
// Dev / Debug conditionals --
|
||||||
// Consts for using if() statements instead of uglier #ifdef macros.
|
// Consts for using if() statements instead of uglier #ifdef macros.
|
||||||
// Abbreviated macros for dev/debug only consoles and msgboxes.
|
// Abbreviated macros for dev/debug only consoles and msgboxes.
|
||||||
|
|
||||||
#ifdef PCSX2_DEVBUILD
|
#ifdef PCSX2_DEVBUILD
|
||||||
|
|
||||||
# define DevCon Console
|
# define DevCon Console
|
||||||
# define DevMsg MsgBox
|
# define DevMsg MsgBox
|
||||||
static const bool IsDevBuild = true;
|
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
# define DevCon 0&&Console
|
# define DevCon 0&&Console
|
||||||
# define DevMsg
|
# define DevMsg
|
||||||
static const bool IsDevBuild = false;
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef _DEBUG
|
#ifdef _DEBUG
|
||||||
|
|
||||||
# define DbgCon Console
|
# define DbgCon Console
|
||||||
static const bool IsDebugBuild = true;
|
|
||||||
|
|
||||||
#else
|
#else
|
||||||
|
|
||||||
# define DbgCon 0&&Console
|
# define DbgCon 0&&Console
|
||||||
static const bool IsDebugBuild = false;
|
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* __SYSTEM_H__ */
|
#endif /* __SYSTEM_H__ */
|
||||||
|
|
Loading…
Reference in New Issue