undef joystick support under Solaris. Reorganized compile config settings slightly.

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@1707 dfc29bdd-3216-0410-991c-e03cc46cb475

include/IrrCompileConfig.h

@@ -8,6 +8,8 @@
 //! Irrlicht SDK Version
 #define IRRLICHT_SDK_VERSION "1.4.2"
 
+#include <stdio.h> // TODO: Although included elsewhere this is required at least for mingw
+
 //! The defines for different operating system are:
 //! _IRR_XBOX_PLATFORM_ for XBox
 //! _IRR_WINDOWS_ for all irrlicht supported Windows versions
@@ -69,7 +71,8 @@
 #endif
 #endif
 
-#include <stdio.h> // TODO: Although included elsewhere this is required at least for mingw
+//! Define _IRR_COMPILE_WITH_JOYSTICK_SUPPORT_ if you want joystick events.
+#define _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
 
 //! Define _IRR_COMPILE_WITH_DIRECT3D_8_ and _IRR_COMPILE_WITH_DIRECT3D_9_ to
 //! compile the Irrlicht engine with Direct3D8 and/or DIRECT3D9.
@@ -177,42 +180,6 @@ Note that the engine will run in D3D REF for this, which is a lot slower than HA
 tool <http://developer.nvidia.com/object/nvperfhud_home.html>. */
 #undef _IRR_USE_NVIDIA_PERFHUD_
 
-
-#ifdef _IRR_WINDOWS_API_
-
-#ifndef _IRR_STATIC_LIB_
-#ifdef IRRLICHT_EXPORTS
-#define IRRLICHT_API __declspec(dllexport)
-#else
-#define IRRLICHT_API __declspec(dllimport)
-#endif // IRRLICHT_EXPORT
-#else
-#define IRRLICHT_API
-#endif // _IRR_STATIC_LIB_
-
-// Declare the calling convention.
-#if defined(_STDCALL_SUPPORTED)
-#define IRRCALLCONV __stdcall
-#else
-#define IRRCALLCONV __cdecl
-#endif // STDCALL_SUPPORTED
-
-#else
-#define IRRLICHT_API
-#define IRRCALLCONV
-#endif // _IRR_WINDOWS_API_
-
-// We need to disable DIRECT3D9 support for Visual Studio 6.0 because
-// those $%&$!! disabled support for it since Dec. 2004 and users are complaining
-// about linker errors. Comment this out only if you are knowing what you are
-// doing. (Which means you have an old DX9 SDK and VisualStudio6).
-#ifdef _MSC_VER
-#if (_MSC_VER < 1300 && !defined(__GNUC__))
-#undef _IRR_COMPILE_WITH_DIRECT3D_9_
-#pragma message("Compiling Irrlicht with Visual Studio 6.0, support for DX9 is disabled.")
-#endif
-#endif
-
 //! Define one of the three setting for Burning's Video Software Rasterizer
 /** So if we were marketing guys we could say Irrlicht has 4 Software-Rasterizers.
 	In a Nutshell:
@@ -333,7 +300,43 @@ precision will be lower but speed higher. currently X86 only
 	//#define IRRLICHT_FAST_MATH
 #endif
 
-// Some cleanup
+// Some cleanup and standard stuff
+
+#ifdef _IRR_WINDOWS_API_
+
+#ifndef _IRR_STATIC_LIB_
+#ifdef IRRLICHT_EXPORTS
+#define IRRLICHT_API __declspec(dllexport)
+#else
+#define IRRLICHT_API __declspec(dllimport)
+#endif // IRRLICHT_EXPORT
+#else
+#define IRRLICHT_API
+#endif // _IRR_STATIC_LIB_
+
+// Declare the calling convention.
+#if defined(_STDCALL_SUPPORTED)
+#define IRRCALLCONV __stdcall
+#else
+#define IRRCALLCONV __cdecl
+#endif // STDCALL_SUPPORTED
+
+#else
+#define IRRLICHT_API
+#define IRRCALLCONV
+#endif // _IRR_WINDOWS_API_
+
+// We need to disable DIRECT3D9 support for Visual Studio 6.0 because
+// those $%&$!! disabled support for it since Dec. 2004 and users are complaining
+// about linker errors. Comment this out only if you are knowing what you are
+// doing. (Which means you have an old DX9 SDK and VisualStudio6).
+#ifdef _MSC_VER
+#if (_MSC_VER < 1300 && !defined(__GNUC__))
+#undef _IRR_COMPILE_WITH_DIRECT3D_9_
+#pragma message("Compiling Irrlicht with Visual Studio 6.0, support for DX9 is disabled.")
+#endif
+#endif
+
 // XBox does not have OpenGL or DirectX9
 #if defined(_IRR_XBOX_PLATFORM_)
 #undef _IRR_COMPILE_WITH_OPENGL_
@@ -352,9 +355,9 @@ precision will be lower but speed higher. currently X86 only
 	#define BURNINGVIDEO_RENDERER_CE
 #endif
 
-//! Define _IRR_COMPILE_WITH_JOYSTICK_SUPPORT_ if you want joystick events.
-#define _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+#if defined(_IRR_SOLARIS_PLATFORM_)
+#undef _IRR_COMPILE_WITH_JOYSTICK_EVENTS_
+#endif
 
 #endif // __IRR_COMPILE_CONFIG_H_INCLUDED__
 
-