Changeset 31 for oscgroups/trunk

Show
Ignore:
Timestamp:
09/27/05 15:03:29 (3 years ago)
Author:
ross
Message:

updated to use new osc/... ip/... include directory conventions from oscpack

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • oscgroups/trunk/GroupServer.cpp

    r7 r31  
    2828#include <assert.h> 
    2929 
    30 #include "NetworkingUtils.h" 
     30#include "ip/NetworkingUtils.h" 
    3131 
    3232/* 

  • oscgroups/trunk/GroupServer.h

    r7 r31  
    3434#include <string> 
    3535 
    36 #include "IpEndpointName.h" 
     36#include "ip/IpEndpointName.h" 
    3737 
    3838class User; 

  • oscgroups/trunk/OscGroupClient.cpp

    r22 r31  
    2929 
    3030 
    31 #include "OscReceivedElements.h" 
    32 #include "OscOutboundPacketStream.h" 
    33 #include "OscPacketListener.h" 
    34  
    35 #include "UdpSocket.h" 
    36 #include "IpEndpointName.h" 
    37 #include "PacketListener.h" 
    38 #include "TimerListener.h" 
     31#include "osc/OscReceivedElements.h" 
     32#include "osc/OscOutboundPacketStream.h" 
     33#include "osc/OscPacketListener.h" 
     34 
     35#include "ip/UdpSocket.h" 
     36#include "ip/IpEndpointName.h" 
     37#include "ip/PacketListener.h" 
     38#include "ip/TimerListener.h" 
    3939 
    4040#include "md5.h" 

  • oscgroups/trunk/OscGroupServer.cpp

    r22 r31  
    2626#include <time.h> 
    2727 
    28 #include "OscReceivedElements.h" 
    29 #include "OscOutboundPacketStream.h" 
    30  
    31 #include "UdpSocket.h" 
    32 #include "OscPacketListener.h" 
    33 #include "TimerListener.h" 
     28#include "osc/OscReceivedElements.h" 
     29#include "osc/OscOutboundPacketStream.h" 
     30 
     31#include "ip/UdpSocket.h" 
     32#include "osc/OscPacketListener.h" 
     33#include "ip/TimerListener.h" 
    3434 
    3535#include "GroupServer.h" 

  • oscgroups/trunk/make.MinGW32.bat

    r7 r31  
    33mkdir bin 
    44 
    5 g++ OscGroupClient.cpp md5.cpp ..\oscpack\osc\OscOutboundPacketStream.cpp ..\oscpack\osc\OscTypes.cpp ..\oscpack\osc\OscReceivedElements.cpp ..\oscpack\ip\win32\NetworkingUtils.cpp ..\oscpack\ip\win32\UdpSocket.cpp ..\oscpack\ip\IpEndpointName.cpp -Wall -I..\oscpack\osc -I..\oscpack\ip -lws2_32 -lwinmm -o bin\OscGroupClient.exe 
     5g++ OscGroupClient.cpp md5.cpp ..\oscpack\osc\OscOutboundPacketStream.cpp ..\oscpack\osc\OscTypes.cpp ..\oscpack\osc\OscReceivedElements.cpp ..\oscpack\ip\win32\NetworkingUtils.cpp ..\oscpack\ip\win32\UdpSocket.cpp ..\oscpack\ip\IpEndpointName.cpp -Wall -I..\oscpack -lws2_32 -lwinmm -o bin\OscGroupClient.exe 
    66 
    7 g++ OscGroupServer.cpp GroupServer.cpp ..\oscpack\osc\OscOutboundPacketStream.cpp ..\oscpack\osc\OscTypes.cpp ..\oscpack\osc\OscReceivedElements.cpp ..\oscpack\ip\win32\NetworkingUtils.cpp ..\oscpack\ip\win32\UdpSocket.cpp ..\oscpack\ip\IpEndpointName.cpp -Wall -I..\oscpack\osc -I..\oscpack\ip -lws2_32 -lwinmm -o bin\OscGroupServer.exe 
     7g++ OscGroupServer.cpp GroupServer.cpp ..\oscpack\osc\OscOutboundPacketStream.cpp ..\oscpack\osc\OscTypes.cpp ..\oscpack\osc\OscReceivedElements.cpp ..\oscpack\ip\win32\NetworkingUtils.cpp ..\oscpack\ip\win32\UdpSocket.cpp ..\oscpack\ip\IpEndpointName.cpp -Wall -I..\oscpack\ -lws2_32 -lwinmm -o bin\OscGroupServer.exe 
    88 
    99