Merge pull request #6 from mkalten/master

major tongseng refresh
fajran · Jul 29, 2016 · 3de88ab · 3de88ab
2 parents 85ddaf5 + 33265dc
commit 3de88ab
Show file tree

Hide file tree

Showing 78 changed files with 2,962 additions and 4,588 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 *.o
 tongseng
-*.swp
-TongsengApp/build
-TongsengApp/TongsengApp.xcodeproj/iang.*
+build
+project.xcworkspace
+xcuserdata
diff --git a/Makefile b/Makefile
@@ -6,25 +6,27 @@ SRC=main.cpp \
 	TUIO/TuioManager.cpp \
 	TUIO/TuioObject.cpp \
 	TUIO/TuioCursor.cpp \
+	TUIO/TuioBlob.cpp \
 	TUIO/TuioContainer.cpp \
 	TUIO/TuioPoint.cpp \
 	TUIO/TuioBlob.cpp \
 	TUIO/TuioDispatcher.cpp \
 	TUIO/UdpSender.cpp \
+	TUIO/OneEuroFilter.cpp \
 	oscpack/ip/posix/NetworkingUtils.cpp \
 	oscpack/ip/posix/UdpSocket.cpp \
 	oscpack/osc/OscOutboundPacketStream.cpp \
 	oscpack/osc/OscTypes.cpp
 
 OBJS=$(SRC:.cpp=.o)
 CPPFLAGS=-ITUIO -Ioscpack
-LIBS=-F/System/Library/PrivateFrameworks -framework MultitouchSupport
+LIBS=-F/System/Library/PrivateFrameworks -framework MultitouchSupport -framework CoreFoundation
 BIN=tongseng
 
 all : $(BIN)
 
 .cpp.o :
-	g++ -c $(CPPFLAGS) $< -o $@
+	g++ $(CPPFLAGS) -c $< -o $@
 
 $(BIN) : $(OBJS)
 	g++ -o $@ $(LIBS) $^