Version 3.0

mus151/Makefile

@@ -1,11 +1,8 @@
 # MUS151 Makefile - Global version for Unix systems which have GNU
-# Makefile utilities installed.
-#
-# This is an example project Makefile, to demonstrate how one might
-# develop an STK project that resides apart from the core STK
-# distribution.  It is highly recommended that you keep your
-# personal STK projects separate from the core distribution, to
-# make upgrading to newer releases more simple.
+# Makefile utilities installed.  If you do not have the GNU Makefile
+# utilities, I suggest you download them.  If that is not possible,
+# look at syntmono/Makefile.sgi to see what has to be done to get
+# things to compile.
 #
 # by Gary P. Scavone
 # CCRMA, Stanford University, 1998.
@@ -16,27 +13,26 @@ OS = $(shell uname)
 # location in your system.  The following definition corresponds
 # to an STK project directory that is a subdirectory of the core
 # STK distribution.
-STK_PATH = ../
+STK_PATH = ../STK/
 
-O_FILES		=	Object.o Envelope.o RawWave.o RawLoop.o \
+O_FILES		=	Object.o Envelope.o WvIn.o RawWvIn.o \
 				SKINI11.o swapstuf.o WvOut.o \
 				RTWvOut.o RTSoundIO.o \
 				\
-				TwoOsc.o
+				TwoOsc.o threads.o
 
 RM = /bin/rm 
 
 ifeq ($(OS),IRIX) # These are for SGI
 	INSTR = MUS151
-	CC = CC -O # -g -fullwarn -D__SGI_CC__
+	CC = CC -O2 -D__OS_IRIX_ # -g -fullwarn -D__SGI_CC__
 	LIBRARY = -L/usr/sgitcl/lib -laudio -lmd -lm
 endif
 
 ifeq ($(OS),Linux) # These are for Linux
 	INSTR = MUS151
-	CC = gcc -O3 # -g -pg -O3
+	CC = g++ -O3 -D__OS_Linux_ # -g
 	LIBRARY = -lpthread -lm
-#	LIBRARY = /lib/libpthread.so.0 -lm
 endif
 
 %.o : $(STK_PATH)%.cpp
@@ -50,6 +46,9 @@ MUS151: MUS151.cpp $(O_FILES)
 TwoOsc.o : TwoOsc.cpp
 	$(CC) -c TwoOsc.cpp
 
+threads.o : threads.cpp
+	$(CC) -c threads.cpp
+
 all: $(INSTR)
 
 clean :