diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 21bedd9..3067ea9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -26,16 +26,18 @@ add_executable( gremlin
 # define executable
 add_executable( gremlin_dedicated
 	Application
-    main
+    server
 	game
 	Time
 	network
-	${VIDEO_SOURCES}
 )
 
 add_dependencies( gremlin
     enet
 ) 
+add_dependencies( gremlin_dedicated
+    enet
+) 
 
 if (WIN32)
     set(PLATFORM_LIBRARIES ws2_32 winmm)
@@ -48,7 +50,11 @@ endif(UNIX)
 target_link_libraries(gremlin
    enet ${PLATFORM_LIBRARIES}
 )
-  
+
+target_link_libraries(gremlin_dedicated
+   enet ${PLATFORM_LIBRARIES}
+)
+
 if (ENABLE_VIDEO)
 	# set dependencies
 	add_dependencies( gremlin
@@ -66,4 +72,4 @@ if (ENABLE_VIDEO)
 	target_link_libraries(gremlin
 	   glfw spark
 	)
-endif(ENABLE_VIDEO)
\ No newline at end of file
+endif(ENABLE_VIDEO)
diff --git a/src/main.cpp b/src/main.cpp
index 5b400cb..f85098f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2,14 +2,6 @@
 
 #include <iostream>
 
-class Server : public Application {
-public:
-	virtual void initialize(int argc, char ** argv) {
-		Application::initialize(argc, argv);
-		setMaster(true);
-	}
-};
-
 int main(int argc, char ** argv) {
 	try {
 		Client app;
diff --git a/src/server.cpp b/src/server.cpp
index 6a144f9..fd462cb 100644
--- a/src/server.cpp
+++ b/src/server.cpp
@@ -5,7 +5,7 @@
 int main(int argc, char ** argv) {
 	try {
 		Application app;
-		app.setMaster();
+		app.setMaster(true);
 		app.initialize(argc, argv);
 		while (app.isRunning())
 			app.update();