Making main.cc compilable with g++

hauke68 · Jul 4, 2012 · d810bda · d810bda
1 parent 6dab159
commit d810bda
Showing 1 changed file with 24 additions and 11 deletions.
diff --git a/src/main.cc b/src/main.cc
@@ -1,22 +1,35 @@
-#include "main.h"
+#include <ClanLib/application.h>
+#include <ClanLib/core.h>
+#include <ClanLib/display.h>
+#include <ClanLib/gl.h>
+#include <ClanLib/gui.h>
+
+#include <vector>
+
+using namespace std;
+
+class Main {
+
+public:
 
 // Implementation of class Main
 #ifdef WINDOWS
-static int Main::WinMain(const vector<CL_String> &args) {
+	static int WinMain(const vector<CL_String> &args) {
 #else
-static int Main::main(const vector<CL_String> &args) {
+	static int main(const vector<CL_String> &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);