piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 14:19:46 -06:00
Code Issues Packages Projects Releases Wiki Activity

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.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6342 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2010-11-04 20:33:45 +00:00
parent 4ac40687ea
commit 3aff478b3a
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Core/Common/Src/Common.h
View File

@ -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