Changeset 7730 for code/branches/masterserver/src/libraries

Timestamp:

Dec 8, 2010, 3:05:07 PM (14 years ago)

Author:

smerkli

Message:

changes done, use —masterserver to launch master server

Location:

code/branches/masterserver/src/libraries/network

Files:

• CMakeLists.txt (modified) (3 diffs)
• MasterServer.h (modified) (2 diffs)

code/branches/masterserver/src/libraries/network/CMakeLists.txt

@@ -37 +37 @@
   Host.cc
   Server.cc
+  MasterServer.cc
+  PeerList.cc
+  ServerList.cc
   ServerConnection.cc
   TrafficControl.cc
@@ -62 +65 @@
   NetworkPrereqs.h
   Server.h
+  MasterServer.h
+  PeerList.h
+  ServerList.h
   ServerConnection.h
   TrafficControl.h
@@ -68 +74 @@
 ADD_SUBDIRECTORY(packet)
 ADD_SUBDIRECTORY(synchronisable)
-ADD_SUBDIRECTORY(masterserver)
 
 ORXONOX_ADD_LIBRARY(network

code/branches/masterserver/src/libraries/network/MasterServer.h

@@ -56 +56 @@
       ~MasterServer();
 
+      /* main routine */
+      int run();
+
     private:
       /* methods */
@@ -74 +77 @@
       bool quit;
 
-      /* main routine */
-      int run();
   };
 }