Build configuration fixes/improvements on Windows

[oweals/minetest.git] / src / common_irrlicht.h

diff --git a/src/common_irrlicht.h b/src/common_irrlicht.h
index 7ce5d8db79d0a6faf4c88b64592d14cf1866f6ec..0a2ed0be1bc3db8ff0d5825637bb3ec3b37f082c 100644 (file)
--- a/src/common_irrlicht.h
+++ b/src/common_irrlicht.h
@@ -23,26 +23,19 @@ with this program; if not, write to the Free Software Foundation, Inc.,
 #define endSceneX(d){d->draw2DLine(v2s32(0,0),v2s32(1,0),\
 video::SColor(255,30,30,30));d->endScene();}
 
-#include <irrlicht.h>
-using namespace irr;
-typedef core::vector3df v3f;
-typedef core::vector3d<s16> v3s16;
-typedef core::vector3d<s32> v3s32;
-
-typedef core::vector2d<f32> v2f;
-typedef core::vector2d<s16> v2s16;
-typedef core::vector2d<s32> v2s32;
-typedef core::vector2d<u32> v2u32;
-typedef core::vector2d<f32> v2f32;
-
-#ifdef _MSC_VER
-       // Windows
-       typedef unsigned long long u64;
-#else
-       // Posix
-       #include <stdint.h>
-       typedef uint64_t u64;
-       //typedef unsigned long long u64;
+#include "irrlichttypes.h"
+
+#ifndef SERVER
+#include <IMesh.h>
+#include <IImage.h>
+#include <IrrlichtDevice.h>
+#include <IMeshSceneNode.h>
+#include <SMesh.h>
+#include <ISceneManager.h>
+#include <IMeshBuffer.h>
+#include <SMeshBuffer.h>
+#include <IGUIElement.h>
+#include <IGUIEnvironment.h>
 #endif
 
 #endif