| 
                Last change
                  on this file since 5964 was
                  5822,
                  checked in by bensch, 20 years ago
           | 
        
        
          | 
               
orxonox/trunk: merged branches/network to the trunk 
merged with command: 
svn merge -r 5505:HEAD branches/network trunk 
 
conflicts resolved in favor of the trunk (as always   
also fixed a typo in the #include "SDL_tread.h" 
 
           | 
        
        | 
            File size:
            603 bytes
           | 
      
      
        
  | Rev | Line |   | 
|---|
| [5554] | 1 | MAINSRCDIR=../.. | 
|---|
 | 2 | include $(MAINSRCDIR)/defs/include_paths.am | 
|---|
 | 3 |  | 
|---|
 | 4 | noinst_LIBRARIES = libORXnet.a | 
|---|
 | 5 |  | 
|---|
 | 6 | libORXnet_a_SOURCES = synchronizeable.cc \ | 
|---|
 | 7 |                       network_manager.cc \ | 
|---|
 | 8 |                       network_socket.cc \ | 
|---|
 | 9 |                       connection_monitor.cc \ | 
|---|
| [5566] | 10 |                       network_stream.cc \ | 
|---|
| [5599] | 11 |                       data_stream.cc \ | 
|---|
 | 12 |                       network_protocol.cc | 
|---|
| [5554] | 13 |  | 
|---|
 | 14 |  | 
|---|
 | 15 |  | 
|---|
 | 16 | noinst_HEADERS = synchronizeable.h \ | 
|---|
 | 17 |                  network_manager.h \ | 
|---|
 | 18 |                  network_socket.h \ | 
|---|
 | 19 |                  connection_monitor.h \ | 
|---|
| [5566] | 20 |                  network_stream.h \ | 
|---|
| [5599] | 21 |                  data_stream.h \ | 
|---|
 | 22 |                  network_protocol.h | 
|---|
| [5554] | 23 |  | 
|---|
       
      
      Note: See 
TracBrowser
        for help on using the repository browser.