Merging r5975 through r6036 from trunk to ogl-es branch.

GLES drivers adapted, but only did make compile-tests.


git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/branches/ogl-es@6038 dfc29bdd-3216-0410-991c-e03cc46cb475

examples/Demo/main.cpp

@@ -0,0 +1,40 @@
+// This is a Demo of the Irrlicht Engine (c) 2005-2009 by N.Gebhardt.
+// This file is not documented.
+
+#include <irrlicht.h>
+#ifdef _IRR_WINDOWS_
+#include <windows.h>
+#endif
+
+#include <stdio.h>
+
+#include "CMainMenu.h"
+#include "CDemo.h"
+
+using namespace irr;
+
+#ifdef _MSC_VER
+
+#pragma comment(lib, "Irrlicht.lib")
+INT WINAPI WinMain( HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT )
+#else
+int main(int argc, char* argv[])
+#endif
+{
+	CMainMenu menu;
+
+	if (menu.run())
+	{
+		CDemo demo(menu.getFullscreen(),
+					menu.getMusic(),
+					menu.getShadows(),
+					menu.getAdditive(),
+					menu.getVSync(),
+					menu.getAntiAliasing(),
+					menu.getDriverType());
+		demo.run();
+	}
+
+	return 0;
+}
+