From 0096ba7c7de3486a704eafc3edafb84c1a48f182 Mon Sep 17 00:00:00 2001 From: cutealien Date: Fri, 30 Aug 2019 15:16:17 +0000 Subject: [PATCH] Fix compilation with SDL device enabled and Windows device disabled. Thanks @kas1e for reporting (http://irrlicht.sourceforge.net/forum/viewtopic.php?f=7&t=52083&p=304892#p304892) Also did change some indention for readability. git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@5861 dfc29bdd-3216-0410-991c-e03cc46cb475 --- include/IrrCompileConfig.h | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/include/IrrCompileConfig.h b/include/IrrCompileConfig.h index df610357..6110e6b9 100644 --- a/include/IrrCompileConfig.h +++ b/include/IrrCompileConfig.h @@ -175,19 +175,23 @@ define out. */ //! Define required options for OpenGL drivers. #if defined(_IRR_COMPILE_WITH_OPENGL_) -#if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_) -#define _IRR_OPENGL_USE_EXTPOINTER_ -#define _IRR_COMPILE_WITH_WGL_MANAGER_ -#elif defined(_IRR_COMPILE_WITH_X11_DEVICE_) -#define _IRR_OPENGL_USE_EXTPOINTER_ -#define _IRR_COMPILE_WITH_GLX_MANAGER_ -#elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_) -#define _IRR_COMPILE_WITH_NSOGL_MANAGER_ -#elif defined(_IRR_SOLARIS_PLATFORM_) -#define _IRR_COMPILE_WITH_GLX_MANAGER_ -#endif + #if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_) + #define _IRR_OPENGL_USE_EXTPOINTER_ + #define _IRR_COMPILE_WITH_WGL_MANAGER_ + #elif defined(_IRR_COMPILE_WITH_X11_DEVICE_) + #define _IRR_OPENGL_USE_EXTPOINTER_ + #define _IRR_COMPILE_WITH_GLX_MANAGER_ + #elif defined(_IRR_COMPILE_WITH_OSX_DEVICE_) + #define _IRR_COMPILE_WITH_NSOGL_MANAGER_ + #elif defined(_IRR_SOLARIS_PLATFORM_) + #define _IRR_COMPILE_WITH_GLX_MANAGER_ + #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) + #define _IRR_OPENGL_USE_EXTPOINTER_ + #endif #endif + + //! Define _IRR_COMPILE_WITH_SOFTWARE_ to compile the Irrlicht engine with software driver /** If you do not need the software driver, or want to use Burning's Video instead, comment this define out */