From 98a6ad72ee819774a398440055abd87bc44e9ba0 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sat, 3 Sep 2016 00:25:52 +0100 Subject: 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. --- lib/win32/emu.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/win32') 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 -- cgit v1.2.3