From 959831f4ef5a3e797f576c3de08cd65032c997ad Mon Sep 17 00:00:00 2001 From: David Walter Seikel Date: Sun, 13 Jan 2013 18:54:10 +1000 Subject: Remove damned ancient DOS line endings from Irrlicht. Hopefully I did not go overboard. --- libraries/irrlicht-1.8/examples/Demo/main.cpp | 98 +++++++++++++-------------- 1 file changed, 49 insertions(+), 49 deletions(-) (limited to 'libraries/irrlicht-1.8/examples/Demo/main.cpp') diff --git a/libraries/irrlicht-1.8/examples/Demo/main.cpp b/libraries/irrlicht-1.8/examples/Demo/main.cpp index 3d26999..a21b48e 100644 --- a/libraries/irrlicht-1.8/examples/Demo/main.cpp +++ b/libraries/irrlicht-1.8/examples/Demo/main.cpp @@ -1,49 +1,49 @@ -// This is a Demo of the Irrlicht Engine (c) 2005-2009 by N.Gebhardt. -// This file is not documented. - -#include -#ifdef _IRR_WINDOWS_ -#include -#endif - -#include - -#include "CMainMenu.h" -#include "CDemo.h" - -using namespace irr; - -#ifdef _WIN32 - -#pragma comment(lib, "Irrlicht.lib") -INT WINAPI WinMain( HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT ) -#else -int main(int argc, char* argv[]) -#endif -{ - bool fullscreen = false; - bool music = true; - bool shadows = false; - bool additive = false; - bool vsync = false; - bool aa = false; - -#ifndef _IRR_WINDOWS_ - video::E_DRIVER_TYPE driverType = video::EDT_OPENGL; -#else - video::E_DRIVER_TYPE driverType = video::EDT_DIRECT3D9; -#endif - - CMainMenu menu; - -//#ifndef _DEBUG - if (menu.run(fullscreen, music, shadows, additive, vsync, aa, driverType)) -//#endif - { - CDemo demo(fullscreen, music, shadows, additive, vsync, aa, driverType); - demo.run(); - } - - return 0; -} - +// This is a Demo of the Irrlicht Engine (c) 2005-2009 by N.Gebhardt. +// This file is not documented. + +#include +#ifdef _IRR_WINDOWS_ +#include +#endif + +#include + +#include "CMainMenu.h" +#include "CDemo.h" + +using namespace irr; + +#ifdef _WIN32 + +#pragma comment(lib, "Irrlicht.lib") +INT WINAPI WinMain( HINSTANCE hInst, HINSTANCE, LPSTR strCmdLine, INT ) +#else +int main(int argc, char* argv[]) +#endif +{ + bool fullscreen = false; + bool music = true; + bool shadows = false; + bool additive = false; + bool vsync = false; + bool aa = false; + +#ifndef _IRR_WINDOWS_ + video::E_DRIVER_TYPE driverType = video::EDT_OPENGL; +#else + video::E_DRIVER_TYPE driverType = video::EDT_DIRECT3D9; +#endif + + CMainMenu menu; + +//#ifndef _DEBUG + if (menu.run(fullscreen, music, shadows, additive, vsync, aa, driverType)) +//#endif + { + CDemo demo(fullscreen, music, shadows, additive, vsync, aa, driverType); + demo.run(); + } + + return 0; +} + -- cgit v1.1