X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FApplications%2Faxwin4_src%2FServer%2Fmain.cpp;h=8f0d9e87b2e1cb3be8bddc2f9e495fef0956c79d;hb=b471bc9adca2cf2126c2b579bf0b33cedd2839a4;hp=e14ef13544a085383425f297eec23e02a9150461;hpb=340e7923b1e95c39ac85a4b22af7f1b53b315cd9;p=tpg%2Facess2.git

diff --git a/Usermode/Applications/axwin4_src/Server/main.cpp b/Usermode/Applications/axwin4_src/Server/main.cpp
index e14ef135..8f0d9e87 100644
--- a/Usermode/Applications/axwin4_src/Server/main.cpp
+++ b/Usermode/Applications/axwin4_src/Server/main.cpp
@@ -1,4 +1,9 @@
 /*
+ * Acess2 GUI v4 (AxWin4)
+ * - By John Hodge (thePowesGang)
+ * 
+ * main.cpp
+ * - Program main
  */
 #include <CConfig.hpp>
 #include <ipc.hpp>
@@ -8,6 +13,7 @@
 #include <timing.hpp>
 #include <exception>
 #include <algorithm>
+#include <common.hpp>
 
 extern "C" {
 #include <stdio.h>
@@ -29,9 +35,9 @@ int main(int argc, char *argv[])
 		return 1;
 	}
 	// - Open graphics
-	Graphics::Initialise(config.m_video);
+	CVideo* vid = new CVideo(config.m_video);
 	// - Initialise compositor structures
-	CCompositor* compositor = new CCompositor(/*config.m_compositor*/);
+	CCompositor* compositor = new CCompositor(/*config.m_compositor,*/ *vid);
 	// - Open input
 	Input::Initialise(config.m_input);
 	//  > Handles hotkeys?
@@ -63,3 +69,13 @@ int main(int argc, char *argv[])
 	return 0;
 }
 
+namespace AxWin {
+
+const char* InitFailure::what() const throw()
+{
+	return m_what;
+}
+
+
+}
+