diff options
| author | Glenn Rice <glennricster@gmail.com> | 2010-11-04 20:33:45 +0000 |
|---|---|---|
| committer | Glenn Rice <glennricster@gmail.com> | 2010-11-04 20:33:45 +0000 |
| commit | 3aff478b3a14ba6eb033162641bd9045c5ac2db5 (patch) | |
| tree | a81a55542fe6575711f9d85904f73d814c14b60c /Source/Core/Common | |
| parent | 4ac40687ead2b2f4bece3f84eed076cb02619c43 (diff) | |
Add the c++ definition HAVE_CONFIG_H in the scons build and check it before including config.h so the cmake build system doesn't need to worry about conflicts from that file if it exists.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6342 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/Common')
| -rw-r--r-- | Source/Core/Common/Src/Common.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/Common/Src/Common.h b/Source/Core/Common/Src/Common.h index 8fc58c8248..842230ed66 100644 --- a/Source/Core/Common/Src/Common.h +++ b/Source/Core/Common/Src/Common.h @@ -108,7 +108,7 @@ extern const char *netplay_dolphin_ver; //CrtDebugBreak breakAt(614); #endif // end DEBUG/FAST -#else +#elif defined HAVE_CONFIG_H #include "config.h" // SCons autoconfiguration defines #endif |