Navigation

← Previous Changeset
Next Changeset →

Changeset 29

Timestamp:

09/27/05 14:51:10 (3 years ago)

Author:

ross

Message:

moved non library code from /osc to /tests and /examples, made all cross-directory includes relative to base directory eg. updated makefile (untested)

Files:

oscpack/trunk/Makefile (modified) (1 diff)
oscpack/trunk/examples (added)
oscpack/trunk/examples/OscDump.cpp (moved) (moved from oscpack/trunk/osc/OscDump.cpp) (1 diff)
oscpack/trunk/ip/posix/NetworkingUtils.cpp (modified) (1 diff)
oscpack/trunk/ip/posix/UdpSocket.cpp (modified) (2 diffs)
oscpack/trunk/ip/win32/NetworkingUtils.cpp (modified) (1 diff)
oscpack/trunk/ip/win32/UdpSocket.cpp (modified) (2 diffs)
oscpack/trunk/make.MinGW32.bat (modified) (1 diff)
oscpack/trunk/osc/OscPacketListener.h (modified) (1 diff)
oscpack/trunk/tests (added)
oscpack/trunk/tests/OscReceiveTest.cpp (moved) (moved from oscpack/trunk/osc/OscReceiveTest.cpp) (1 diff)
oscpack/trunk/tests/OscReceiveTest.h (moved) (moved from oscpack/trunk/osc/OscReceiveTest.h)
oscpack/trunk/tests/OscSendTests.cpp (moved) (moved from oscpack/trunk/osc/OscSendTests.cpp) (1 diff)
oscpack/trunk/tests/OscSendTests.h (moved) (moved from oscpack/trunk/osc/OscSendTests.h)
oscpack/trunk/tests/OscUnitTests.cpp (moved) (moved from oscpack/trunk/osc/OscUnitTests.cpp) (1 diff)
oscpack/trunk/tests/OscUnitTests.h (moved) (moved from oscpack/trunk/osc/OscUnitTests.h)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

oscpack/trunk/Makefile

r5	r29
11	11	ENDIANESS=OSC_HOST_LITTLE_ENDIAN
12	12
13		SENDSOURCES = ./~~osc~~/OscSendTests.cpp ./osc/OscOutboundPacketStream.cpp ./osc/OscTypes.cpp ./ip/posix/NetworkingUtils.cpp ./ip/posix/UdpSocket.cpp ./ip/IpEndpointName.cpp
	13	SENDSOURCES = ./tests/OscSendTests.cpp ./osc/OscOutboundPacketStream.cpp ./osc/OscTypes.cpp ./ip/posix/NetworkingUtils.cpp ./ip/posix/UdpSocket.cpp ./ip/IpEndpointName.cpp
14	14	SENDOBJECTS = $(SENDSOURCES:.cpp=.o)
15	15
16		RECEIVESOURCES = ./~~osc~~/OscReceiveTest.cpp ./osc/OscTypes.cpp ./osc/OscReceivedElements.cpp ./osc/OscPrintReceivedElements.cpp ./ip/posix/NetworkingUtils.cpp ./ip/posix/UdpSocket.cpp
	16	RECEIVESOURCES = ./tests/OscReceiveTest.cpp ./osc/OscTypes.cpp ./osc/OscReceivedElements.cpp ./osc/OscPrintReceivedElements.cpp ./ip/posix/NetworkingUtils.cpp ./ip/posix/UdpSocket.cpp
17	17	RECEIVEOBJECTS = $(RECEIVESOURCES:.cpp=.o)
18	18
19		DUMPSOURCES = ./~~osc~~/OscDump.cpp ./osc/OscTypes.cpp ./osc/OscReceivedElements.cpp ./osc/OscPrintReceivedElements.cpp ./ip/posix/NetworkingUtils.cpp ./ip/posix/UdpSocket.cpp
	19	DUMPSOURCES = ./examples/OscDump.cpp ./osc/OscTypes.cpp ./osc/OscReceivedElements.cpp ./osc/OscPrintReceivedElements.cpp ./ip/posix/NetworkingUtils.cpp ./ip/posix/UdpSocket.cpp
20	20	DUMPOBJECTS = $(DUMPSOURCES:.cpp=.o)
21	21
22		TESTSOURCES = ./~~osc~~/OscUnitTests.cpp ./osc/OscOutboundPacketStream.cpp ./osc/OscTypes.cpp ./osc/OscReceivedElements.cpp ./osc/OscPrintReceivedElements.cpp
	22	TESTSOURCES = ./tests/OscUnitTests.cpp ./osc/OscOutboundPacketStream.cpp ./osc/OscTypes.cpp ./osc/OscReceivedElements.cpp ./osc/OscPrintReceivedElements.cpp
23	23	TESTOBJECTS = $(TESTSOURCES:.cpp=.o)
24	24
25		INCLUDES = -I./~~ip -I./osc~~
	25	INCLUDES = -I./
26	26	COPTS = -Wall -O3
27	27	CDEBUG = -Wall -g

oscpack/trunk/examples/OscDump.cpp

r20	r29
38	38	#include <iostream>
39	39
40		#include "OscReceivedElements.h"
41		#include "OscPrintReceivedElements.h"
	40	#include "osc/OscReceivedElements.h"
	41	#include "osc/OscPrintReceivedElements.h"
42	42
43		#include "UdpSocket.h"
44		#include "PacketListener.h"
	43	#include "ip/UdpSocket.h"
	44	#include "ip/PacketListener.h"
45	45
46	46

oscpack/trunk/ip/posix/NetworkingUtils.cpp

r16	r29
28	28	WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
29	29	*/
30		#include "NetworkingUtils.h"
	30	#include "ip/NetworkingUtils.h"
31	31
32	32	#include <netdb.h>

oscpack/trunk/ip/posix/UdpSocket.cpp

r27	r29
1		#include "UdpSocket.h"
	1	#include "ip/UdpSocket.h"
2	2
3	3
…	…
21	21	#include <netinet/in.h> // for sockaddr_in
22	22
23		#include "PacketListener.h"
24		#include "TimerListener.h"
	23	#include "ip/PacketListener.h"
	24	#include "ip/TimerListener.h"
25	25
26	26

oscpack/trunk/ip/win32/NetworkingUtils.cpp

r16	r29
28	28	WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
29	29	*/
30		#include "NetworkingUtils.h"
	30	#include "ip/NetworkingUtils.h"
31	31
32	32	#include <winsock2.h> // this must come first to prevent errors with MSVC7

oscpack/trunk/ip/win32/UdpSocket.cpp

r16	r29
28	28	WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
29	29	*/
30		#include "UdpSocket.h"
	30	#include "ip/UdpSocket.h"
31	31
32	32	#include <winsock2.h> // this must come first to prevent errors with MSVC7
…	…
40	40	#include <signal.h>
41	41
42		#include "NetworkingUtils.h"
43		#include "PacketListener.h"
44		#include "TimerListener.h"
	42	#include "ip/NetworkingUtils.h"
	43	#include "ip/PacketListener.h"
	44	#include "ip/TimerListener.h"
45	45
46	46

oscpack/trunk/make.MinGW32.bat

r5	r29
5	5	mkdir bin
6	6
7		g++ ~~osc\OscUnitTests.cpp osc\OscTypes.cpp osc\OscReceivedElements.cpp osc\OscPrintReceivedElements.cpp osc\OscOutboundPacketStream.cpp -Wall -I..\ip~~ -lws2_32 -o bin\OscUnitTests.exe
	7	g++ tests\OscUnitTests.cpp osc\OscTypes.cpp osc\OscReceivedElements.cpp osc\OscPrintReceivedElements.cpp osc\OscOutboundPacketStream.cpp -Wall -I.\ -lws2_32 -o bin\OscUnitTests.exe
8	8
9		g++ ~~osc\OscDump.cpp osc\OscTypes.cpp osc\OscReceivedElements.cpp osc\OscPrintReceivedElements.cpp ip\win32\NetworkingUtils.cpp ip\win32\UdpSocket.cpp -Wall -Iip~~ -lws2_32 -lwinmm -o bin\OscDump.exe
	9	g++ examples\OscDump.cpp osc\OscTypes.cpp osc\OscReceivedElements.cpp osc\OscPrintReceivedElements.cpp ip\win32\NetworkingUtils.cpp ip\win32\UdpSocket.cpp -Wall -I.\ -lws2_32 -lwinmm -o bin\OscDump.exe
10	10
11		g++ ~~osc\OscSendTests.cpp osc\OscTypes.cpp osc\OscOutboundPacketStream.cpp ip\win32\NetworkingUtils.cpp ip\win32\UdpSocket.cpp ip\IpEndpointName.cpp -Wall -Iip~~ -lws2_32 -lwinmm -o bin\OscSendTests.exe
	11	g++ tests\OscSendTests.cpp osc\OscTypes.cpp osc\OscOutboundPacketStream.cpp ip\win32\NetworkingUtils.cpp ip\win32\UdpSocket.cpp ip\IpEndpointName.cpp -Wall -I.\ -lws2_32 -lwinmm -o bin\OscSendTests.exe
12	12
13		g++ ~~osc\OscReceiveTest.cpp osc\OscTypes.cpp osc\OscReceivedElements.cpp ip\win32\NetworkingUtils.cpp ip\win32\UdpSocket.cpp -Wall -Iip~~ -lws2_32 -lwinmm -o bin\OscReceiveTest.exe
	13	g++ tests\OscReceiveTest.cpp osc\OscTypes.cpp osc\OscReceivedElements.cpp ip\win32\NetworkingUtils.cpp ip\win32\UdpSocket.cpp -Wall -I.\ -lws2_32 -lwinmm -o bin\OscReceiveTest.exe
14	14
15	15	.\bin\OscUnitTests.exe

oscpack/trunk/osc/OscPacketListener.h

r16 r29

32 32
33 33 #include "OscReceivedElements.h"
34 #include "PacketListener.h"
34 #include "ip/PacketListener.h"
35 35
36 36

oscpack/trunk/tests/OscReceiveTest.cpp

r20	r29
33	33	#include <iostream>
34	34
35		#include "OscReceivedElements.h"
36
37		#include "UdpSocket.h"
38		#include "OscPacketListener.h"
	35	#include "osc/OscReceivedElements.h"
	36
	37	#include "ip/UdpSocket.h"
	38	#include "osc/OscPacketListener.h"
39	39
40	40

oscpack/trunk/tests/OscSendTests.cpp

r16	r29
33	33	#include <string.h>
34	34
35		#include "OscOutboundPacketStream.h"
36
37		#include "UdpSocket.h"
38		#include "IpEndpointName.h"
	35	#include "osc/OscOutboundPacketStream.h"
	36
	37	#include "ip/UdpSocket.h"
	38	#include "ip/IpEndpointName.h"
39	39
40	40	#define IP_MTU_SIZE 1536

oscpack/trunk/tests/OscUnitTests.cpp

r16	r29
33	33	#include <iomanip>
34	34
35		#include "OscReceivedElements.h"
36		#include "OscPrintReceivedElements.h"
37		#include "OscOutboundPacketStream.h"
	35	#include "osc/OscReceivedElements.h"
	36	#include "osc/OscPrintReceivedElements.h"
	37	#include "osc/OscOutboundPacketStream.h"
38	38
39	39

Navigation

Changeset 29

Legend:

Download in other formats: