From d810bda543d10ff16907c809c6d220597bbbd975 Mon Sep 17 00:00:00 2001 From: Hauke Zuehl Date: Wed, 4 Jul 2012 10:18:32 +0200 Subject: [PATCH] Making main.cc compilable with g++ --- src/main.cc | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/src/main.cc b/src/main.cc index b830ce2..02e5d70 100644 --- a/src/main.cc +++ b/src/main.cc @@ -1,22 +1,35 @@ -#include "main.h" +#include +#include +#include +#include +#include + +#include + +using namespace std; + +class Main { + +public: // Implementation of class Main #ifdef WINDOWS -static int Main::WinMain(const vector &args) { + static int WinMain(const vector &args) { #else -static int Main::main(const vector &args) { + static int main(const vector &args) { #endif - // Setup ClanLib modules - CL_SetupCore setup_core; - CL_SetupDisplay setup_display; - CL_SetupGL setup_gl; - CL_SetupGUI setup_gui; + // Setup ClanLib modules + CL_SetupCore setup_core; + CL_SetupDisplay setup_display; + CL_SetupGL setup_gl; + CL_SetupGUI setup_gui; - // Start the game here + // Start the game here - return 0; -} + return 0; + } +}; #ifdef WINDOWS CL_ClanApplication app(&Main::WinMain);