Skip to content

Commit 3de88ab

Browse files
authored
Merge pull request #6 from mkalten/master
major tongseng refresh
2 parents 85ddaf5 + 33265dc commit 3de88ab

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

78 files changed

+2962
-4588
lines changed

.gitignore

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
*.o
22
tongseng
3-
*.swp
4-
TongsengApp/build
5-
TongsengApp/TongsengApp.xcodeproj/iang.*
3+
build
4+
project.xcworkspace
5+
xcuserdata

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,27 @@ SRC=main.cpp \
66
TUIO/TuioManager.cpp \
77
TUIO/TuioObject.cpp \
88
TUIO/TuioCursor.cpp \
9+
TUIO/TuioBlob.cpp \
910
TUIO/TuioContainer.cpp \
1011
TUIO/TuioPoint.cpp \
1112
TUIO/TuioBlob.cpp \
1213
TUIO/TuioDispatcher.cpp \
1314
TUIO/UdpSender.cpp \
15+
TUIO/OneEuroFilter.cpp \
1416
oscpack/ip/posix/NetworkingUtils.cpp \
1517
oscpack/ip/posix/UdpSocket.cpp \
1618
oscpack/osc/OscOutboundPacketStream.cpp \
1719
oscpack/osc/OscTypes.cpp
1820

1921
OBJS=$(SRC:.cpp=.o)
2022
CPPFLAGS=-ITUIO -Ioscpack
21-
LIBS=-F/System/Library/PrivateFrameworks -framework MultitouchSupport
23+
LIBS=-F/System/Library/PrivateFrameworks -framework MultitouchSupport -framework CoreFoundation
2224
BIN=tongseng
2325

2426
all : $(BIN)
2527

2628
.cpp.o :
27-
g++ -c $(CPPFLAGS) $< -o $@
29+
g++ $(CPPFLAGS) -c $< -o $@
2830

2931
$(BIN) : $(OBJS)
3032
g++ -o $@ $(LIBS) $^

0 commit comments

Comments
 (0)