Changeset 441

Timestamp:

Dec 9, 2007, 5:45:12 PM (17 years ago)

Author:

scheusso

Message:

some cmake hacking, some testing

Location:

code/branches/FICN/src/network

Files:

• CMakeLists.txt (modified) (2 diffs)
• Makefile.test (modified) (1 diff)
• dummyclient2.cc (modified) (1 diff)
• dummyclient3.cc (modified) (2 diffs)
• dummyserver.cc (modified) (2 diffs)
• dummyserver3.cc (modified) (1 diff)

code/branches/FICN/src/network/CMakeLists.txt

@@ -1 +1 @@
 PROJECT(Orxonox)
+
+SET( CHATCLIENT_SRC_FILES
+  dummyclient3.cc
+)
+SET( CHATSERVER_SRC_FILES
+  dummyserver3.cc
+)
+
+
 
 SET( NETWORK_SRC_FILES
@@ -18 +27 @@
 ADD_LIBRARY(network SHARED ${NETWORK_SRC_FILES})
 TARGET_LINK_LIBRARIES(network ${ENet_LIBRARY} ${Boost_thread_LIBRARIES})
+
+ADD_EXECUTABLE(chatserver ${CHATSERVER_SRC_FILES})
+TARGET_LINK_LIBRARIES( chatserver
+  ${OGRE_LIBRARIES}
+  ${OIS_LIBRARIES}
+  network
+  core
+  objects
+)
+
+ADD_EXECUTABLE(chatclient ${CHATCLIENT_SRC_FILES})
+TARGET_LINK_LIBRARIES( chatclient
+  ${OGRE_LIBRARIES}
+  ${OIS_LIBRARIES}
+  network
+  core
+  objects
+)
+
+ADD_EXECUTABLE(client dummyclient2.cc)
+ADD_EXECUTABLE(server dummyserver.cc)
+TARGET_LINK_LIBRARIES( client
+  ${OGRE_LIBRARIES}
+  ${OIS_LIBRARIES}
+  network
+  core
+  objects
+)
+TARGET_LINK_LIBRARIES( server
+  ${OGRE_LIBRARIES}
+  ${OIS_LIBRARIES}
+  network
+  core
+  objects
+)
+

code/branches/FICN/src/network/Makefile.test

@@ -6 +6 @@
 
 # Link command:
-server: PacketBuffer.o ConnectionManager.o dummyserver.o PacketDecoder.o PacketGenerator.o
-        ${CC} PacketDecoder.o PacketGenerator.o ConnectionManager.o dummyserver.o PacketBuffer.o -o server -lenet -lboost_thread -g
+server: PacketBuffer.o ConnectionManager.o dummyserver.o PacketDecoder.o PacketGenerator.o ClientInformation.o
+        ${CC} PacketDecoder.o PacketGenerator.o ClientInformation.o ConnectionManager.o dummyserver.o PacketBuffer.o -o server -lenet -lboost_thread -g
 
 dummyserver.o: dummyserver.cc

code/branches/FICN/src/network/dummyclient2.cc

@@ -47 +47 @@
       std::cout << "failed sending" << std::endl;
     }
-    //usleep(100000);
+    usleep(1000000);
   }
 

code/branches/FICN/src/network/dummyclient3.cc

@@ -8 +8 @@
 int main(){
   network::PacketGenerator pck;
-  const int PORT = 55556
+  const int PORT = 55556;
   std::cout << "Enter address of the server xxx.xxx.xxx.xxx (enter for localhost)" << std::endl;
   std::string str;
@@ -18 +18 @@
   Client client( str, PORT );
   if ( client.establishConnection() )
-          cout << "connection established" << endl;
-  else cout << "problems establishing connection" << endl;
+          std::cout << "connection established" << std::endl;
+  else std::cout << "problems establishing connection" << std::endl;
   
   while (true) {
           client.update();
-          cout << "your message: ";
-          getline( cin, str );
+          std::cout << "your message: ";
+          std::getline( std::cin, str );
           client.sendChat( str );
   }

code/branches/FICN/src/network/dummyserver.cc

@@ -9 +9 @@
 #include "ConnectionManager.h"
 #include "PacketManager.h"
+#include "ClientInformation.h"
 
 #ifdef WIN32
@@ -21 +22 @@
 
 int main(){
-  ConnectionManager server = ConnectionManager();
   bool quit=false;
   ENetPacket *packet;
+  ClientInformation clients;
+  ConnectionManager server = ConnectionManager(&clients);
   server.createListener();
 

code/branches/FICN/src/network/dummyserver3.cc

@@ -39 +39 @@
 }
 
-int main(int argc, char *argv[]){
-  dummyserver3 server;
-  server.loop();
-  return 0;
+
 }
 
-
+int main(int argc, char **argv[]){
+  network::dummyserver3 server;
+  server.loop();
+  return 0;  
 }