Changeset 9347 in orxonox.OLD for branches/proxy/src/lib/network/Makefile.am

Timestamp:

Jul 20, 2006, 11:43:27 AM (19 years ago)

Author:

bensch

Message:

orxonox/proxy: merged the proxy.old back again, and it seems to work.

Merged with command
svn merge -r9247:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy.old .

no conflicts

File:

• branches/proxy/src/lib/network/Makefile.am (modified) (8 diffs)

branches/proxy/src/lib/network/Makefile.am

@@ -8 +8 @@
                       shared_network_data.cc \
                       network_socket.cc \
-                      connection_monitor.cc \
                       network_stream.cc \
                       data_stream.cc \
@@ -20 +19 @@
                       network_game_manager.cc \
                       converter.cc \
+                      peer_info.cc \
                       message_manager.cc \
                       network_log.cc \
@@ -25 +25 @@
                       player_stats.cc \
                       udp_broadcast.cc \
+                      \
+                      proxy/proxy_settings.cc \
+                      \
+                      monitor/connection_monitor.cc \
+                      monitor/network_monitor.cc \
+                      monitor/network_node.cc \
                       \
                       synchronizeable_var/synchronizeable_var.cc \
@@ -33 +39 @@
                       synchronizeable_var/synchronizeable_float.cc \
                       synchronizeable_var/synchronizeable_bool.cc \
-                      synchronizeable_var/synchronizeable_uint.cc 
+                      synchronizeable_var/synchronizeable_uint.cc \
+                      synchronizeable_var/synchronizeable_ip.cc \
+                      \
+                      ip.cc
 
 
@@ -42 +51 @@
                  shared_network_data.h \
                  network_socket.h \
-                 connection_monitor.h \
                  network_stream.h \
                  data_stream.h \
@@ -54 +62 @@
                  network_game_manager.h \
                  converter.h \
+                 peer_info.h \
                  netdefs.h \
                  message_manager.h \
@@ -60 +69 @@
                  player_stats.h \
                  udp_broadcast.h \
+                 \
+                 proxy/proxy_settings.cc \
+                 \
+                 monitor/connection_monitor.h \
+                 monitor/network_monitor.h \
+                 monitor/network_node.h \
                  \
                  synchronizeable_var/synchronizeable_var.h \
@@ -68 +83 @@
                  synchronizeable_var/synchronizeable_float.h \
                  synchronizeable_var/synchronizeable_bool.h \
-                 synchronizeable_var/synchronizeable_uint.h
+                 synchronizeable_var/synchronizeable_uint.h \
+                 synchronizeable_var/synchronizeable_ip.h \
+                 \
+                 ip.h