diff options
| author | kwolekr <kwolekr@minetest.net> | 2015-11-08 23:08:53 -0500 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2015-11-08 23:13:47 -0500 |
| commit | 889f893ff37021d97d1805c2e21128b5befa21f5 (patch) | |
| tree | 58f6bb04df8db44fabe0a5d30fd25df7f2b4076a /src/main.cpp | |
| parent | 88a3977954f537b391c714be2a52da6b19711154 (diff) | |
| download | minetest-889f893ff37021d97d1805c2e21128b5befa21f5.tar.gz minetest-889f893ff37021d97d1805c2e21128b5befa21f5.tar.bz2 minetest-889f893ff37021d97d1805c2e21128b5befa21f5.zip | |
Abort compile when attempting to build client with Irrlicht 1.8.2
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/src/main.cpp b/src/main.cpp index 5046181b5..151ea7148 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -18,11 +18,11 @@ with this program; if not, write to the Free Software Foundation, Inc., */ #ifdef _MSC_VER -#ifndef SERVER // Dedicated server isn't linked with Irrlicht - #pragma comment(lib, "Irrlicht.lib") - // This would get rid of the console window - //#pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup") -#endif + #ifndef SERVER // Dedicated server isn't linked with Irrlicht + #pragma comment(lib, "Irrlicht.lib") + // This would get rid of the console window + //#pragma comment(linker, "/subsystem:windows /ENTRY:mainCRTStartup") + #endif #pragma comment(lib, "zlibwapi.lib") #pragma comment(lib, "Shell32.lib") #endif @@ -59,7 +59,14 @@ with this program; if not, write to the Free Software Foundation, Inc., #endif #ifdef HAVE_TOUCHSCREENGUI -#include "touchscreengui.h" + #include "touchscreengui.h" +#endif + +#if !defined(SERVER) && \ + (IRRLICHT_VERSION_MAJOR == 1) && \ + (IRRLICHT_VERSION_MINOR == 8) && \ + (IRRLICHT_VERSION_REVISION == 2) + #error "Irrlicht 1.8.2 is known to be broken - please update Irrlicht to version >= 1.8.3" #endif #define DEBUGFILE "debug.txt" |