Changeset 9406 in orxonox.OLD for trunk/src/lib/network/Makefile.am

Timestamp:

Jul 24, 2006, 11:09:47 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy back

merged with commandsvn merge -r9346:HEAD ​https://svn.orxonox.net/orxonox/branches/proxy .

no conflicts

File:

• trunk/src/lib/network/Makefile.am (modified) (4 diffs)

trunk/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/network_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
 
 
 
 
-noinst_HEADERS = synchronizeable.h \
-                 network_manager.h \
-                 shared_network_data.h \
-                 network_socket.h \
-                 connection_monitor.h \
-                 network_stream.h \
-                 data_stream.h \
-                 network_protocol.h \
-                 server_socket.h \
-                 tcp_server_socket.h \
-                 tcp_socket.h \
-                 udp_server_socket.h \
-                 udp_socket.h \
-                 handshake.h \
-                 network_game_manager.h \
-                 converter.h \
-                 netdefs.h \
-                 message_manager.h \
-                 network_log.h \
-                 zip.h \
-                 player_stats.h \
-                 udp_broadcast.h \
-                 \
-                 synchronizeable_var/synchronizeable_var.h \
-                 synchronizeable_var/synchronizeable_vector.h \
-                 synchronizeable_var/synchronizeable_int.h \
-                 synchronizeable_var/synchronizeable_quaternion.h \
-                 synchronizeable_var/synchronizeable_string.h \
-                 synchronizeable_var/synchronizeable_float.h \
-                 synchronizeable_var/synchronizeable_bool.h \
-                 synchronizeable_var/synchronizeable_uint.h
-
-
+noinst_HEADERS = \
+                netdefs.h \
+                nettypes.h \
+                netincl.h \
+                \
+                synchronizeable.h \
+                network_manager.h \
+                shared_network_data.h \
+                network_socket.h \
+                network_stream.h \
+                data_stream.h \
+                network_protocol.h \
+                server_socket.h \
+                tcp_server_socket.h \
+                tcp_socket.h \
+                udp_server_socket.h \
+                udp_socket.h \
+                handshake.h \
+                network_game_manager.h \
+                converter.h \
+                peer_info.h \
+                netdefs.h \
+                message_manager.h \
+                network_log.h \
+                zip.h \
+                player_stats.h \
+                udp_broadcast.h \
+                \
+                proxy/network_settings.cc \
+                \
+                monitor/connection_monitor.h \
+                monitor/network_monitor.h \
+                monitor/network_node.h \
+                \
+                synchronizeable_var/synchronizeable_var.h \
+                synchronizeable_var/synchronizeable_vector.h \
+                synchronizeable_var/synchronizeable_int.h \
+                synchronizeable_var/synchronizeable_quaternion.h \
+                synchronizeable_var/synchronizeable_string.h \
+                synchronizeable_var/synchronizeable_float.h \
+                synchronizeable_var/synchronizeable_bool.h \
+                synchronizeable_var/synchronizeable_uint.h \
+                synchronizeable_var/synchronizeable_ip.h \
+                \
+                ip.h