diff options
| author | click <none@none> | 2010-08-16 09:51:37 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-08-16 09:51:37 +0200 |
| commit | b4bef54b7a6be1b25d670c3f630b1c4370da7757 (patch) | |
| tree | 8cd73603c83a6de93ebb57160a3a7ac5c26359aa /externals/ace/config-macros.h | |
| parent | ced726264653bed9a41a7725465a9292786dafc4 (diff) | |
Fix Windows-build (YES, IT COMPILES!) - partial revert of revision a9386a2655
- Use minihack on ACE to avoid using config.h on Windows platforms
- Put include-locations for ACE in AFTER everything else (for later use)
An insane thanks to paradox for being patient with testing changes and swapouts
--HG--
branch : trunk
Diffstat (limited to 'externals/ace/config-macros.h')
| -rw-r--r-- | externals/ace/config-macros.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/externals/ace/config-macros.h b/externals/ace/config-macros.h index 96a385e31a1..6820fc351d9 100644 --- a/externals/ace/config-macros.h +++ b/externals/ace/config-macros.h @@ -21,7 +21,11 @@ #ifndef ACE_CONFIG_MACROS_H #define ACE_CONFIG_MACROS_H -#include "ace/config.h" +#ifdef _WIN32 + #include "ace/config-win32.h" +#else + #include "ace/config.h" +#endif #include "ace/Version.h" #include "ace/Versioned_Namespace.h" |