Skip to content

Commit

Permalink
Update to demo project Makefile.in and Demo.tcl to fix problems due t…
Browse files Browse the repository at this point in the history
…o previous updates.
  • Loading branch information
garyscavone committed Mar 25, 2015
1 parent 87461b1 commit 8c0ad97
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions projects/demo/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ LIBRARY = @LIBS@

REALTIME = @realtime@
ifeq ($(REALTIME),yes)
PROGRAMS += demo
PROGRAMS += stk-demo
OBJECTS += RtMidi.o RtAudio.o Thread.o Mutex.o Socket.o TcpServer.o @objects@
endif

Expand All @@ -65,7 +65,7 @@ stk-demo: demo.cpp $(OBJECTS)
$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o stk-demo demo.cpp $(OBJECT_PATH)/*.o $(LIBRARY)

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
$(CC) $(LDFLAGS) $(CFLAGS) $(DEFS) -o Md2Skini Md2Skini.cpp $(OBJECT_PATH)/Stk.o $(OBJECT_PATH)/RtMidi.o $(LIBRARY)
Expand Down
2 changes: 1 addition & 1 deletion projects/demo/tcl/Demo.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -683,7 +683,7 @@ proc patchChange {value} {
set cont2 64.0
set cont4 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 " 2 $cont2
printWhatz "ControlChange 0.0 1 " 4 $cont4
Expand Down

0 comments on commit 8c0ad97

Please sign in to comment.