diff options
author | Chris Wilson <chris+github@qwirx.com> | 2016-09-03 00:25:52 +0100 |
---|---|---|
committer | Chris Wilson <chris+github@qwirx.com> | 2016-09-09 20:54:12 +0100 |
commit | 98a6ad72ee819774a398440055abd87bc44e9ba0 (patch) | |
tree | 55a5c7eff8deaab2ab7d44ed0357576aa0687a96 /lib/win32 | |
parent | 11a8c444875d8b7912fa07bdc3854e3adb27aa4e (diff) |
Fix Unix compilation using CMake.
Add platform detection that's compatible with the old buildsystem and its m4
autoconfigury.
Make Travis build and test using CMake as a separate target.
Remove unused function BoxGetTemporaryDirectoryName() to fixes compile using
CMake on Unix.
Diffstat (limited to 'lib/win32')
-rw-r--r-- | lib/win32/emu.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/win32/emu.h b/lib/win32/emu.h index d0b7081b..91793004 100644 --- a/lib/win32/emu.h +++ b/lib/win32/emu.h @@ -18,7 +18,9 @@ #define EMU_INCLUDE // Need feature detection macros below -#ifdef _MSC_VER +#if defined BOX_CMAKE +# include "../common/BoxConfig.cmake.h" +#elif defined _MSC_VER # include "../common/BoxConfig-MSVC.h" # define NEED_BOX_VERSION_H #else |