e1lama/stk
1
0
Fork 0
mirror of https://github.com/thestk/stk synced 2026-01-11 20:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to demo project Makefile.in and Demo.tcl to fix problems due to previous updates.

Browse Source
This commit is contained in:
Gary Scavone
2015-03-25 16:09:03 -04:00
parent 87461b1471
commit 8c0ad97a25
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
projects/demo/Makefile.in
View File

@@ -39,7 +39,7 @@ LIBRARY = @LIBS@
REALTIME = @realtime@ REALTIME = @realtime@
ifeq ($(REALTIME),yes) ifeq ($(REALTIME),yes)
PROGRAMS += demo PROGRAMS += stk-demo
OBJECTS += RtMidi.o RtAudio.o Thread.o Mutex.o Socket.o TcpServer.o @objects@ OBJECTS += RtMidi.o RtAudio.o Thread.o Mutex.o Socket.o TcpServer.o @objects@
endif endif
@@ -65,7 +65,7 @@ stk-demo: demo.cpp $(OBJECTS)
$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o stk-demo demo.cpp $(OBJECT_PATH)/*.o $(LIBRARY) $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o stk-demo demo.cpp $(OBJECT_PATH)/*.o $(LIBRARY)
libdemo: demo.cpp libdemo: demo.cpp
$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o demo utilities.cpp demo.cpp -L../../src -lstk $(LIBRARY) $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o stk-demo utilities.cpp demo.cpp -L../../src -lstk $(LIBRARY)
Md2Skini: Md2Skini.cpp Stk.o RtMidi.o Md2Skini: Md2Skini.cpp Stk.o RtMidi.o
$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o Md2Skini Md2Skini.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/RtMidi.o $(LIBRARY) $(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o Md2Skini Md2Skini.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/RtMidi.o $(LIBRARY)

2
projects/demo/tcl/Demo.tcl
View File

@@ -683,7 +683,7 @@ proc patchChange {value} {
set cont2 64.0 set cont2 64.0
set cont4 64.0 set cont4 64.0
set cont11 64.0 set cont11 64.0
puts $outID [format "ControlChange 0.0 1 16 %3.2f" $preset] puts [format "ControlChange 0.0 1 16 %3.2f" $preset]
printWhatz "ControlChange 0.0 1 " 1 $cont1 printWhatz "ControlChange 0.0 1 " 1 $cont1
printWhatz "ControlChange 0.0 1 " 2 $cont2 printWhatz "ControlChange 0.0 1 " 2 $cont2
printWhatz "ControlChange 0.0 1 " 4 $cont4 printWhatz "ControlChange 0.0 1 " 4 $cont4